bergamasco 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0cf1655e4bdd865a5fd7136bc2aecbe6fd9934f
-  data.tar.gz: 0b8adf4ba9a2e730775284901bcd755b477dc9bb
+  metadata.gz: 4d0569cf27c3e1b39f7f627e8e444904c4d559ac
+  data.tar.gz: b35abe4ff49c530007e5b67648d0d5fba612334f
 SHA512:
-  metadata.gz: 22d8606fd89ca6a98b67904be181150ccc0fb87abf481d338ec6c19cd8ee41204659acb32e705f461e26f4433494134135ac8477e39430926ba5bf742456243d
-  data.tar.gz: 6edaba580e43f7131e721cf6df3b9f9b5c27debce5039f2cf345c3805d38c347bd0da6e623075b41e51e5f06d6f70b7c5c3bdcb5060d3b52dc2d4442235fef6f
+  metadata.gz: ca6e9010494aa2cd9a0e1fbf8a0ea371a40fc074ea5ec5616e079211baa171961cc02ee1f52594b6957f18f9a74a3de50dd0ec9035d801a0ed16fb7061eea825
+  data.tar.gz: 7ac8ff15b82f376686abd7c50a6c604165542a511b3613eb1e2ead5321597f83f92e827ebae5c8d1452c4e7ab492fdc5d73077f5dfbd0a2629dfdff6658acb8d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bergamasco (0.2.3)
+    bergamasco (0.2.4)
       activesupport (~> 4.2, >= 4.2.5)
       addressable (~> 2.3.8)
       builder (~> 3.2, >= 3.2.2)

data/lib/bergamasco/markdown.rb

@@ -37,7 +37,7 @@ module Bergamasco
     end
 
     def self.read_yaml_for_doi_metadata(filepath, options={})
-      keys = options[:keys] || ["title", "author", "date", "tags"]
+      keys = options[:keys] || ["title", "author", "date", "tags", "summary", "doi", "type", "version", "citation"]
       unless File.exist?(filepath)
         parentdir = Pathname.new(filepath).parent
         FileUtils.mkdir_p parentdir
@@ -51,7 +51,7 @@ module Bergamasco
       content = YAML_FRONT_MATTER_REGEXP.match(file).post_match
       html = render_html(content, options)
       metadata["summary"] = Bergamasco::Summarize.summary_from_html(html, options)
-      metadata["related_identifiers"] = extract_references(html, options)
+      metadata["citation"] = extract_references(html)
       metadata["date"] = metadata["date"].iso8601
       metadata
     end
@@ -70,25 +70,9 @@ module Bergamasco
     end
 
     # expects a references list generated by pandoc
-    def self.extract_references(html, options={})
+    def self.extract_references(html)
       doc = Nokogiri::HTML(html)
-      doc.xpath('//div[@id="refs"]/div/@id').map do |ref|
-        id = ref.value[4..-1]
-
-        if /(http|https):\/\/(dx\.)?doi\.org\/(\w+)/.match(id)
-          uri = Addressable::URI.parse(id)
-          id = uri.path[1..-1].upcase
-          type = "DOI"
-        else
-          type = "URL"
-        end
-
-        {
-          value: id,
-          related_identifier_type: type,
-          relation_type: "References"
-        }
-      end
+      doc.xpath('//div[@id="refs"]/div/@id').map { |ref| ref.value[4..-1] }
     end
   end
 end

data/lib/bergamasco/version.rb

@@ -1,3 +1,3 @@
 module Bergamasco
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/markdown_spec.rb

@@ -53,12 +53,7 @@ describe Bergamasco::Markdown do
     filepath = fixture_path + 'cool-dois.html.md'
     separator = "READMORE"
     metadata = subject.read_yaml_for_doi_metadata(filepath, separator: separator, csl: 'spec/apa.csl', bibliography: 'spec/references.bib')
-    expect(metadata["related_identifiers"]).to eq([{:value=>"https://www.w3.org/Provider/Style/URI",
-        :related_identifier_type=>"URL",
-        :relation_type=>"References"},
-      { :value=>"10.1371/JOURNAL.PONE.0115253",
-        :related_identifier_type=>"DOI",
-        :relation_type=>"References" }])
+    expect(metadata["citation"]).to eq(["https://www.w3.org/Provider/Style/URI", "https://doi.org/10.1371/journal.pone.0115253"])
   end
 
   it 'should write yaml' do
@@ -88,12 +83,7 @@ describe Bergamasco::Markdown do
     filepath = fixture_path + 'cool-dois.html.md'
     file = IO.read(filepath)
     html = subject.render_html(file, skip_yaml_header: true, csl: 'spec/apa.csl', bibliography: 'spec/references.bib')
-    refs = subject.extract_references(html, skip_yaml_header: true, csl: 'spec/apa.csl', bibliography: 'spec/references.bib')
-    expect(refs).to eq([{:value=>"https://www.w3.org/Provider/Style/URI",
-        :related_identifier_type=>"URL",
-        :relation_type=>"References"},
-      { :value=>"10.1371/JOURNAL.PONE.0115253",
-        :related_identifier_type=>"DOI",
-        :relation_type=>"References" }])
+    refs = subject.extract_references(html)
+    expect(refs).to eq(["https://www.w3.org/Provider/Style/URI", "https://doi.org/10.1371/journal.pone.0115253"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bergamasco
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Martin Fenner