relaton-bib 1.11.2 → 1.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d15360baaf96bbd8ba4bb079f5c1ed71b2d1a3c04a709b7b26122b10ea6e998d
-  data.tar.gz: ea64b85cfe56d2bac01881c246877f9ffb5329bf108dbffbe9e9ce789352a244
+  metadata.gz: 4879a622c8f133828b75abffc19166c9bc8047d9ecff25bbcd7b8cdc472acde4
+  data.tar.gz: 27b37f70ddf22ded981996ac98ae58b284b99790ff0d1bb96a55c100fc08a850
 SHA512:
-  metadata.gz: c94693cbcd3a935883d608a80af6d8660ebf08a079898a4658ed057fd5ce7f84e93631f33579f8fbc6696b80f1413fac49b2dd48af120d5c60c7e104ebbf1b01
-  data.tar.gz: e98dca1228dff147f05e7ea460a95ea909137fa49fdd38fdc9af3c9147e3030e0ef1c65906f79dac5f108b5d2d0107410c52bf8d584a75401f01fd112a8205cb
+  metadata.gz: 46fdb1f657ae745e28ac3e4b11fa17b4bd42a75fef5c9aca29b7834796df6f75bdff1f73ef81222784f9dae07ea200a821d8d3ad10d754f5ee75eebded5e8fd1
+  data.tar.gz: 4a86ff51080029116ce9a0745f8411442fa6ce8da5a89b278a3a0dc38ffd4368fc36b516d9ea631662e74fc3704284889dfa1af758dba209520371824fe6321f

data/.github/workflows/rake.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
+        ruby: [ '3.0', '2.7', '2.6' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
     steps:
@@ -24,10 +24,6 @@ jobs:
         with:
           submodules: true
 
-      # https://github.com/ruby-debug/debase/issues/89#issuecomment-686827382
-      - if: matrix.os == 'macos-latest' && matrix.ruby == '2.5'
-        run: echo BUNDLE_BUILD__DEBASE="--with-cflags=\"-Wno-error=implicit-function-declaration\"" >> $GITHUB_ENV
-
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/.rubocop.yml

@@ -7,6 +7,6 @@ require: rubocop-rails
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
 Rails:
   Enabled: false

data/README.adoc

@@ -416,6 +416,19 @@ item.to_bibtex
   ...
 ----
 
+=== Export bibliographic item to Citeproc
+
+[source,ruby]
+----
+item.to_citeproc
+=> [{"title"=>"Geographic information",
+  "edition"=>"1",
+  "author"=>[{"family"=>"Bierman", "given"=>"A."}, {"family"=>"Bierman", "given"=>"Forename"}],
+  "publisher"=>"Institute of Electrical and Electronics Engineers",
+  "publisher-place"=>"bib place",
+  ...
+----
+
 === Exporting bibliographic item to AsciiBib
 
 [source,ruby]

data/lib/relaton_bib/bibliographic_item.rb

@@ -401,30 +401,26 @@ module RelatonBib
       hash
     end
 
-    # @param bibtex [BibTeX::Bibliography, NilClass]
+    #
+    # Reander BibTeX
+    #
+    # @param bibtex [BibTeX::Bibliography, nil]
+    #
     # @return [String]
-    def to_bibtex(bibtex = nil) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
-      item = BibTeX::Entry.new
-      item.type = bibtex_type
-      item.key = id
-      bibtex_title item
-      item.edition = edition if edition
-      bibtex_author item
-      bibtex_contributor item
-      item.address = place.first.name if place.any?
-      bibtex_note item
-      bibtex_relation item
-      bibtex_extent item
-      bibtex_date item
-      bibtex_series item
-      bibtex_classification item
-      item.keywords = keyword.map(&:content).join(", ") if keyword.any?
-      bibtex_docidentifier item
-      item.timestamp = fetched.to_s if fetched
-      bibtex_link item
-      bibtex ||= BibTeX::Bibliography.new
-      bibtex << item
-      bibtex.to_s
+    #
+    def to_bibtex(bibtex = nil)
+      bibtext_item(bibtex).to_s
+    end
+
+    #
+    # Render citeproc
+    #
+    # @param bibtex [BibTeX::Bibliography, nil]
+    #
+    # @return [Hash] citeproc
+    #
+    def to_citeproc(bibtex = nil)
+      bibtext_item(bibtex).to_citeproc.map { |cp| cp.transform_keys(&:to_s) }
     end
 
     # @param lang [String, nil] language code Iso639
@@ -555,13 +551,35 @@ module RelatonBib
 
     private
 
-    # @return [String]
-    def bibtex_title(item)
-      title.each do |t|
-        case t.type
-        when "main" then item.tile = t.title.content
-        end
-      end
+    #
+    # Create BibTeX item for this document
+    #
+    # @param [BibTeX::Bibliography, nil] bibtex <description>
+    #
+    # @return [BibTeX::Bibliography] BibTeX bibliography
+    #
+    def bibtext_item(bibtex) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+      item = BibTeX::Entry.new
+      item.type = bibtex_type
+      item.key = id
+      title.to_bibtex item
+      item.edition = edition if edition
+      bibtex_author item
+      bibtex_contributor item
+      item.address = place.first.name if place.any?
+      bibtex_note item
+      bibtex_relation item
+      bibtex_extent item
+      bibtex_date item
+      bibtex_series item
+      bibtex_classification item
+      item.keywords = keyword.map(&:content).join(", ") if keyword.any?
+      bibtex_docidentifier item
+      item.timestamp = fetched.to_s if fetched
+      bibtex_link item
+      bibtex ||= BibTeX::Bibliography.new
+      bibtex << item
+      bibtex
     end
 
     # @return [String]

data/lib/relaton_bib/bibxml_parser.rb

@@ -194,7 +194,7 @@ module RelatonBib
     # @return [Array<RelatonBib::FormattedString>]
     def abstracts(ref)
       ref.xpath("./front/abstract").map do |a|
-        c = a.children.to_s.gsub(/\s*(<\/?)t(>)\s*/, '\1p\2')
+        c = a.inner_html.gsub(/\s*(<\/?)t(>)\s*/, '\1p\2')
           .gsub(/[\t\n]/, " ").squeeze " "
         FormattedString.new(content: c, language: language(ref), script: "Latn",
                             format: "text/html")

data/lib/relaton_bib/localized_string.rb

@@ -56,14 +56,10 @@ module RelatonBib
       else
         builder.parent["language"] = language.join(",") if language&.any?
         builder.parent["script"]   = script.join(",") if script&.any?
-        builder.parent << escaped_content # .encode(xml: :text)
+        builder.text content
       end
     end
 
-    def escaped_content
-      content.encode("UTF-8") # .gsub(/&/, "&amp;").gsub(/"/, "&quot;").gsub(/'/, "&apos;")
-    end
-
     # @return [Hash]
     def to_hash # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
       if content.is_a? String

data/lib/relaton_bib/typed_title_string.rb

@@ -62,6 +62,18 @@ module RelatonBib
       tl.each { |t| opts[:builder].title { t.to_xml opts[:builder] } }
     end
 
+    #
+    # Add main title ot bibtex entry
+    #
+    # @param [BibTeX::Entry] item bibtex entry
+    #
+    def to_bibtex(item)
+      tl = titles.detect { |t| t.type == "main" }
+      return unless tl
+
+      item.title = tl.title.content
+    end
+
     private
 
     # @param lang [String]

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.11.2".freeze
+  VERSION = "1.11.5".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -354,7 +354,7 @@ module RelatonBib
       # @return [Array<RelatonBib::FormattedString>]
       def fetch_abstract(item)
         item.xpath("./abstract").map do |a|
-          c = a.children.to_s
+          c = a.text.strip # children.to_s
           FormattedString.new(content: c, language: a[:language],
                               script: a[:script], format: a[:format])
         end

data/relaton-bib.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
 
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
@@ -36,5 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable"
   spec.add_dependency "bibtex-ruby"
   spec.add_dependency "iso639"
-  spec.add_dependency "nokogiri", "~> 1.12.5"
+  spec.add_dependency "nokogiri", "~> 1.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.11.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-25 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.5
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.5
+        version: 1.13.0
 description: 'RelatonBib: Ruby XMLDOC impementation.'
 email:
 - open.source@ribose.com
@@ -270,7 +270,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="