bibtex-ruby 4.3.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc634591f21e9ea1d2e9a79a277e5637fa0f6c85
-  data.tar.gz: 4828e5209b60c9d582c8d63737f9ed15bb1331a7
+  metadata.gz: 5dfbf77f5cb8ff87f6e54b9ebdb9f4426ff10486
+  data.tar.gz: a2bf09bd352b691ff2c61d35374994bc100d23a3
 SHA512:
-  metadata.gz: 8132ee6e23158667aae83447cda153fc5e50157530f2193302141de3c5675bb80e4c79a27a0dfe6f5acc1c65815cf6c499dc5ffaf1f9fa4da6a30587e2da6642
-  data.tar.gz: df3f6095f2de0bfc5e43b18cb2561ee6977093782b6998b956d267898a893fe28680d94b0362cc4f3e7da538eb7fe2a4be43a5480025b4ba789c8b065e3b66b6
+  metadata.gz: f19357e079e206da98bdcb1486f56b26de608d98dbcf0ba49b840f7e038b68f000ed3a038a55183396423fa5bc75ef5e748f929fba1745ab67ef62366056c021
+  data.tar.gz: cc471fc94d1b2b0101d8ea35b8fe439b4a0d08dfd42a935881e2d07c1b22d750697552b83c3ee0ea71c8a8ddcfaba85af82cfebc47aa1f9702078630859b11fb

data/Gemfile

@@ -1,9 +1,15 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'rdf', '~>1.1'
 gem 'json', '~>1.8', :platforms => [:mri_18, :jruby, :rbx]
 
+if RUBY_VERSION >= '2.0'
+  gem 'rdf', '~>2.0'
+  gem 'rdf-vocab', '~>2.0'
+else
+  gem 'rdf', '~>1.1'
+end
+
 gem 'rubysl', '~>2.0', :platforms => :rbx
 
 group :debug do

data/lib/bibtex/entry/rdf_converter.rb

@@ -1,5 +1,11 @@
 require 'uri/common'
 
+begin
+  require 'rdf/vocab'
+rescue LoadError
+  ::RDF::Vocab = RDF # support RDF on Ruby 1.9
+end
+
 class BibTeX::Entry::RDFConverter
   DEFAULT_REMOVE_FROM_FALLBACK = %w(
     bdsk-file-1
@@ -62,7 +68,7 @@ class BibTeX::Entry::RDFConverter
     return unless bibtex.field?(:abstract)
     remove_from_fallback(:abstract)
 
-    graph << [entry, RDF::DC.abstract, bibtex[:abstract].to_s]
+    graph << [entry, RDF::Vocab::DC.abstract, bibtex[:abstract].to_s]
     graph << [entry, bibo[:abstract], bibtex[:abstract].to_s]
   end
 
@@ -89,7 +95,7 @@ class BibTeX::Entry::RDFConverter
     bibtex[:author].each do |name|
       node = agent(name) { create_agent(name, :Person) }
 
-      graph << [entry, RDF::DC.creator, node]
+      graph << [entry, RDF::Vocab::DC.creator, node]
       graph << [seq, RDF.li, node]
     end
   end
@@ -99,7 +105,7 @@ class BibTeX::Entry::RDFConverter
     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, RDF::Vocab::DC.URI, bibtex[field].to_s]
       graph << [entry, bibo[:uri], bibtex[field].to_s]
       count  += 1
     end
@@ -118,9 +124,9 @@ class BibTeX::Entry::RDFConverter
 
     series = RDF::Node.new
     graph << [series, RDF.type, bibo[:Document]]
-    graph << [series, RDF::DC.title, bibtex[:booktitle].to_s]
+    graph << [series, RDF::Vocab::DC.title, bibtex[:booktitle].to_s]
 
-    graph << [entry, RDF::DC.isPartOf, series]
+    graph << [entry, RDF::Vocab::DC.isPartOf, series]
   end
 
   def chapter
@@ -136,7 +142,7 @@ class BibTeX::Entry::RDFConverter
     bibtex.children.each do |child|
       child_id = RDF::URI.new(child.identifier)
       BibTeX::Entry::RDFConverter.new(child, graph, agent).convert! unless uri_in_graph?(child_id)
-      graph << [entry, RDF::DC.hasPart, child_id]
+      graph << [entry, RDF::Vocab::DC.hasPart, child_id]
     end
   end
 
@@ -144,21 +150,21 @@ class BibTeX::Entry::RDFConverter
     return unless bibtex.field?(:copyright)
     remove_from_fallback(:copyright)
 
-    graph << [entry, RDF::DC.rightsHolder, bibtex[:copyright].to_s]
+    graph << [entry, RDF::Vocab::DC.rightsHolder, bibtex[:copyright].to_s]
   end
 
   def date_added
     return unless bibtex.field?(:'date-added')
     remove_from_fallback(:'date-added')
 
-    graph << [entry, RDF::DC.created, bibtex[:'date-added'].to_s]
+    graph << [entry, RDF::Vocab::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]
+    graph << [entry, RDF::Vocab::DC.modified, bibtex[:'date-modified'].to_s]
   end
 
   def doi
@@ -166,7 +172,7 @@ class BibTeX::Entry::RDFConverter
     remove_from_fallback(:doi)
 
     graph << [entry, bibo[:doi], bibtex[:doi].to_s]
-    graph << [entry, RDF::DC.identifier, "doi:#{bibtex[:doi].to_s}"]
+    graph << [entry, RDF::Vocab::DC.identifier, "doi:#{bibtex[:doi].to_s}"]
   end
 
   def edition
@@ -202,7 +208,7 @@ class BibTeX::Entry::RDFConverter
     return unless bibtex[:howpublished] =~ /^#{URI.regexp}$/
     remove_from_fallback(:howpublished)
 
-    graph << [entry, RDF::DC.URI, bibtex[:howpublished].to_s]
+    graph << [entry, RDF::Vocab::DC.URI, bibtex[:howpublished].to_s]
     graph << [entry, bibo[:uri], bibtex[:howpublished].to_s]
   end
 
@@ -212,7 +218,7 @@ class BibTeX::Entry::RDFConverter
 
     org = agent(bibtex[:institution].to_s) { create_agent(bibtex[:institution].to_s, :Organization) }
 
-    graph << [entry, RDF::DC.contributor, org]
+    graph << [entry, RDF::Vocab::DC.contributor, org]
   end
 
   def isbn
@@ -222,9 +228,9 @@ class BibTeX::Entry::RDFConverter
     graph << [entry, bibo[:isbn], bibtex[:isbn].to_s]
 
     if bibtex.contained?
-      graph << [entry, RDF::DC.isPartOf, "urn:isbn:#{bibtex[:isbn].to_s}"]
+      graph << [entry, RDF::Vocab::DC.isPartOf, "urn:isbn:#{bibtex[:isbn].to_s}"]
     else
-      graph << [entry, RDF::DC.identifier, "urn:isbn:#{bibtex[:isbn].to_s}"]
+      graph << [entry, RDF::Vocab::DC.identifier, "urn:isbn:#{bibtex[:isbn].to_s}"]
     end
   end
 
@@ -234,9 +240,9 @@ class BibTeX::Entry::RDFConverter
 
     graph << [entry, bibo[:issn], bibtex[:issn].to_s]
     if bibtex.contained?
-      graph << [entry, RDF::DC.isPartOf, "urn:issn:#{bibtex[:issn].to_s}"]
+      graph << [entry, RDF::Vocab::DC.isPartOf, "urn:issn:#{bibtex[:issn].to_s}"]
     else
-      graph << [entry, RDF::DC.identifier, "urn:issn:#{bibtex[:issn].to_s}"]
+      graph << [entry, RDF::Vocab::DC.identifier, "urn:issn:#{bibtex[:issn].to_s}"]
     end
   end
 
@@ -250,7 +256,7 @@ class BibTeX::Entry::RDFConverter
     source << "No. #{bibtex[:number].to_s}" if bibtex.field?(:number)
     pagination = bibtex[:pagination] || 'pp.'
     source << "#{pagination.to_s} #{bibtex[:pages].to_s}" if bibtex.field?(:pages)
-    graph << [entry, RDF::DC.source, source.join(', ')]
+    graph << [entry, RDF::Vocab::DC.source, source.join(', ')]
   end
 
   def journal_dc_part_of
@@ -260,13 +266,13 @@ class BibTeX::Entry::RDFConverter
 
     journal = RDF::Node.new
     graph << [journal, RDF.type, bibo[:Journal]]
-    graph << [journal, RDF::DC.title, bibtex[:journal].to_s]
+    graph << [journal, RDF::Vocab::DC.title, bibtex[:journal].to_s]
 
-    graph << [entry, RDF::DC.isPartOf, journal]
+    graph << [entry, RDF::Vocab::DC.isPartOf, journal]
   end
 
   def key
-    graph << [entry, RDF::DC.identifier, "urn:bibtex:#{bibtex.key}"]
+    graph << [entry, RDF::Vocab::DC.identifier, "urn:bibtex:#{bibtex.key}"]
   end
 
   def keywords
@@ -274,7 +280,7 @@ class BibTeX::Entry::RDFConverter
     remove_from_fallback(:keywords)
 
     bibtex[:keywords].to_s.split(/\s*[,;]\s*/).each do |keyword|
-      graph << [entry, RDF::DC.subject, keyword]
+      graph << [entry, RDF::Vocab::DC.subject, keyword]
     end
   end
 
@@ -284,14 +290,14 @@ class BibTeX::Entry::RDFConverter
 
     bibtex[:language] = 'german' if bibtex[:language] == 'ngerman'
 
-    graph << [entry, RDF::DC.language, bibtex[:language].to_s]
+    graph << [entry, RDF::Vocab::DC.language, bibtex[:language].to_s]
   end
 
   def location
     return unless bibtex.field?(:location)
     remove_from_fallback(:location)
 
-    graph << [entry, RDF::DC.Location, bibtex[:location].to_s]
+    graph << [entry, RDF::Vocab::DC.Location, bibtex[:location].to_s]
     if [:proceedings, :inproceedings, :conference].include?(bibtex.type)
       event = RDF::Vocabulary.new('http://purl.org/NET/c4dm/event.owl')
       graph << [entry, event[:place], org]
@@ -334,7 +340,7 @@ class BibTeX::Entry::RDFConverter
 
     org = agent(bibtex[:organization].to_s) { create_agent(bibtex[:organization].to_s, :Organization) }
 
-    graph << [entry, RDF::DC.contributor, org]
+    graph << [entry, RDF::Vocab::DC.contributor, org]
     graph << [entry, bibo[:organizer], org] if [:proceedings, :inproceedings, :conference].include?(bibtex.type)
   end
 
@@ -363,7 +369,7 @@ class BibTeX::Entry::RDFConverter
 
     parent_id = RDF::URI.new(bibtex.parent.identifier)
     BibTeX::Entry::RDFConverter.new(bibtex.parent, graph, agent).convert! unless uri_in_graph?(parent_id)
-    graph << [entry, RDF::DC.isPartOf, parent_id]
+    graph << [entry, RDF::Vocab::DC.isPartOf, parent_id]
   end
 
   def publisher
@@ -387,7 +393,7 @@ class BibTeX::Entry::RDFConverter
       graph << [org, address[:localityName], bibtex[:address]]
     end
 
-    graph << [entry, RDF::DC.publisher, org]
+    graph << [entry, RDF::Vocab::DC.publisher, org]
     graph << [entry, bibo[:publisher], org]
   end
 
@@ -397,7 +403,7 @@ class BibTeX::Entry::RDFConverter
 
     org = agent(bibtex[:school].to_s) { create_agent(bibtex[:school].to_s, :Organization) }
 
-    graph << [entry, RDF::DC.contributor, org]
+    graph << [entry, RDF::Vocab::DC.contributor, org]
   end
 
   def series
@@ -409,9 +415,9 @@ class BibTeX::Entry::RDFConverter
 
     series = RDF::Node.new
     graph << [series, RDF.type, bibo[:MultiVolumeBook]]
-    graph << [series, RDF::DC.title, bibtex[:series].to_s]
+    graph << [series, RDF::Vocab::DC.title, bibtex[:series].to_s]
 
-    graph << [entry, RDF::DC.isPartOf, series]
+    graph << [entry, RDF::Vocab::DC.isPartOf, series]
   end
 
   def thesis_degree
@@ -449,7 +455,7 @@ class BibTeX::Entry::RDFConverter
     title = [bibtex[:title].to_s, bibtex[:subtitle].to_s]
       .reject { |t| t.nil? || t.empty? }
       .join(': ')
-    graph << [entry, RDF::DC.title, title]
+    graph << [entry, RDF::Vocab::DC.title, title]
     graph << [entry, bibo[:shortTitle], bibtex[:title].to_s] if bibtex.field?(:subtitle)
   end
 
@@ -461,7 +467,7 @@ class BibTeX::Entry::RDFConverter
       create_agent(bibtex[:translator].to_s, :Person)
     end
 
-    graph << [entry, RDF::DC.contributor, node]
+    graph << [entry, RDF::Vocab::DC.contributor, node]
     graph << [entry, bibo[:translator], node]
   end
 
@@ -470,9 +476,9 @@ class BibTeX::Entry::RDFConverter
 
     case bibtex.type
     when :proceedings, :journal
-      graph << [entry, RDF::DC.type, 'Collection']
+      graph << [entry, RDF::Vocab::DC.type, 'Collection']
     else
-      graph << [entry, RDF::DC.type, 'Text']
+      graph << [entry, RDF::Vocab::DC.type, 'Text']
     end
   end
 
@@ -480,7 +486,7 @@ class BibTeX::Entry::RDFConverter
     return unless bibtex.field?(:url)
     remove_from_fallback(:url)
 
-    graph << [entry, RDF::DC.URI, bibtex[:url].to_s]
+    graph << [entry, RDF::Vocab::DC.URI, bibtex[:url].to_s]
     graph << [entry, bibo[:uri], bibtex[:url].to_s]
   end
 
@@ -509,7 +515,7 @@ class BibTeX::Entry::RDFConverter
     end
     date = month.nil? ? year : [year, month].join('-')
 
-    graph << [entry, RDF::DC.issued, date]
+    graph << [entry, RDF::Vocab::DC.issued, date]
   end
 
   protected
@@ -542,8 +548,8 @@ class BibTeX::Entry::RDFConverter
   def create_agent(name, type)
     node = RDF::Node.new
 
-    graph << [node, RDF.type, RDF::FOAF[type]]
-    graph << [node, RDF::FOAF.name, name.to_s]
+    graph << [node, RDF.type, RDF::Vocab::FOAF[type]]
+    graph << [node, RDF::Vocab::FOAF.name, name.to_s]
 
     if name.is_a?(BibTeX::Name)
       [:given, :family, :prefix, :suffix].each do |part|

data/lib/bibtex/version.rb

@@ -19,7 +19,7 @@
 module BibTeX
   module Version
     MAJOR = 4
-    MINOR = 3
+    MINOR = 4
     PATCH = 0
     BUILD = nil
 

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: bibtex-ruby
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-05-14 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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
 description: |
@@ -135,33 +135,33 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A BibTeX parser, converter and API for Ruby.
 test_files:
-- test/bibtex/test_value.rb
+- test/bibtex/entry/test_rdf_converter.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/entry/test_rdf_converter.rb
+- test/bibtex/test_utilities.rb
+- test/bibtex/test_value.rb
 - test/test_bibtex.rb
 - test/test_export.rb
 has_rdoc: yard