cirneco 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f84bd343343bca95dd71bbf62ac42be576a3a0d
-  data.tar.gz: a7ef59d0ec01f797e685d66556f3f61b5704bb24
+  metadata.gz: fbfad88c2c54f5051b560e08c5e4b8bf712a0ddf
+  data.tar.gz: 6eb1e706e6fdb0315b2c1605d38da5239bcedfaf
 SHA512:
-  metadata.gz: 57714645e611407a055d826d79f77b3309531b40caef8cc3998ae766166818136016de02801a6e7c6685ac81a19bdd804ba8314d5b54eaca9d5f4b49868da4f5
-  data.tar.gz: 01ba2c44e86adca34aab2800cacd45ddd2b1cd575e30a08479124e34fb4c80a9d9698ca9762344dfa8783a036e82d54d278a3fdf3e40e05e62314ee7f1892e37
+  metadata.gz: 76547c8dfa55b15f623d9bd083a3f1dabb40f41262d41943e3766ff04e7d6e1d48409cc68bc2556e60b105a61437e061890da2b61bb59dad6bd2606a073824e5
+  data.tar.gz: 552148f8314551d7bae6bce5f35031b3708df2e3ad19c400d8ce4b8777d4e76a6c4e9ce5d94923efa212d78303922f37e6a7f1dd1a6a4c8fff4ecc9bffe008e5

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    cirneco (0.7.2)
+    cirneco (0.7.3)
       activesupport (~> 4.2, >= 4.2.5)
       base32-crockford-checksum (~> 0.2.2)
-      bergamasco (~> 0.2)
+      bergamasco (~> 0.3)
       builder (~> 3.2, >= 3.2.2)
       dotenv (~> 2.1, >= 2.1.1)
       maremma (~> 3.1)
@@ -22,11 +22,10 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.3.8)
     base32-crockford-checksum (0.2.3)
-    bergamasco (0.2.14)
+    bergamasco (0.3.4)
       activesupport (~> 4.2, >= 4.2.5)
       addressable (~> 2.3.8)
       builder (~> 3.2, >= 3.2.2)
-      commonmarker (~> 0.14.0)
       loofah (~> 2.0, >= 2.0.3)
       multi_json (~> 1.11.2)
       nokogiri (~> 1.6.7)
@@ -36,8 +35,6 @@ GEM
     builder (3.2.2)
     codeclimate-test-reporter (1.0.3)
       simplecov
-    commonmarker (0.14.0)
-      ruby-enum (~> 0.4)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
@@ -93,8 +90,6 @@ GEM
     rspec-xsd (0.1.0)
       nokogiri (~> 1.6)
       rspec (~> 3)
-    ruby-enum (0.6.0)
-      i18n
     safe_yaml (1.0.4)
     simplecov (0.12.0)
       docile (~> 1.1.0)

data/cirneco.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   # Declary dependencies here, rather than in the Gemfile
   s.add_dependency 'maremma', '~> 3.1'
-  s.add_dependency 'bergamasco', '~> 0.2'
+  s.add_dependency 'bergamasco', '~> 0.3'
   s.add_dependency 'base32-crockford-checksum', '~> 0.2.2'
   s.add_dependency 'nokogiri', '~> 1.6', '>= 1.6.8'
   s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'

data/lib/cirneco/utils.rb

@@ -33,12 +33,12 @@ module Cirneco
       return "File #{filename} ignored: not a markdown file" unless File.extname(filepath) == ".md"
 
       old_metadata = Bergamasco::Markdown.read_yaml_for_doi_metadata(filepath)
-      return "No new DOI minted" if old_metadata["doi"] && old_metadata["published"]
+      return "DOI #{old_metadata["doi"]} not changed for #{filename}" if old_metadata["doi"] && old_metadata["published"]
 
       metadata = generate_metadata_for_work(filepath, options)
       work = post_metadata_for_work(metadata, options)
 
-      return "Errors for DOI #{metadata["doi"]}:\n#{work.validation_errors}" if work.validation_errors.present?
+      # return "Errors for DOI #{metadata["doi"]}:\n#{work.validation_errors}" if work.validation_errors.present?
 
       new_metadata = Bergamasco::Markdown.update_file(filepath, "doi" => metadata["doi"], "published" => true)
       "DOI #{new_metadata["doi"]} minted for #{filename}"
@@ -51,12 +51,12 @@ module Cirneco
       return "File #{filename} ignored: not a markdown file" unless File.extname(filepath) == ".md"
 
       old_metadata = Bergamasco::Markdown.read_yaml_for_doi_metadata(filepath)
-      return "No new DOI hidden" unless old_metadata["doi"] && old_metadata["published"]
+      return "DOI #{old_metadata["doi"]} not changed for #{filename}" unless old_metadata["doi"] && old_metadata["published"]
 
       metadata = generate_metadata_for_work(filepath, options)
       work = hide_metadata_for_work(metadata, options)
 
-      return "Errors for DOI #{old_metadata["doi"]}:\n#{work.validation_errors}" if work.validation_errors.present?
+      # return "Errors for DOI #{old_metadata["doi"]}:\n#{work.validation_errors}" if work.validation_errors.present?
 
       new_metadata = Bergamasco::Markdown.update_file(filepath, "published" => false)
       "DOI #{old_metadata["doi"]} hidden for #{filename}"
@@ -65,20 +65,20 @@ module Cirneco
     def mint_dois_for_all_files(folderpath, options={})
       Dir.glob("#{folderpath}/*.md").map do |filepath|
         mint_doi_for_file(filepath, options)
-      end.uniq.join("\n")
+      end.join("\n")
     end
 
     def hide_dois_for_all_files(folderpath, options={})
       Dir.glob("#{folderpath}/*.md").map do |filepath|
         hide_doi_for_file(filepath, options)
-      end.uniq.join("\n")
+      end.join("\n")
     end
 
     def generate_metadata_for_work(filepath, options={})
       sitepath = options[:sitepath] || ENV['SITE_SITEPATH'] || "data/site.yml"
       authorpath = options[:authorpath] || ENV['SITE_AUTHORPATH'] || "data/authors.yml"
       referencespath = options[:referencespath] || ENV['SITE_REFERENCESPATH'] || "data/references.yaml"
-      csl = options[:csl] || ENV['SITE_CSL'] || "styles/apa.csl"
+      csl = options[:csl] || ENV['SITE_CSLPATH'] || "styles/apa.csl"
       options = options.merge(csl: csl, bibliography: referencespath)
 
       metadata = Bergamasco::Markdown.read_yaml_for_doi_metadata(filepath, options.except(:number))
@@ -162,9 +162,9 @@ module Cirneco
         }
       end.select { |t| t[:related_identifier_type].present? }
 
-      license_name = site_options.fetch("license", {}).fetch("name", nil) || ENV['SITE_LICENCE_NAME'] || "Creative Commons Attribution"
-      license_url = site_options.fetch("license", {}).fetch("url", nil) || ENV['SITE_LICENCE_URL'] || "https://creativecommons.org/licenses/by/4.0/"
-      metadata["rights_list"] = [{ value: license_name, rights_uri: license_url }]
+      metadata["license_name"] = site_options.fetch("license", {}).fetch("name", nil) || ENV['SITE_LICENCE_NAME'] || "Creative Commons Attribution"
+      metadata["license_url"] = site_options.fetch("license", {}).fetch("url", nil) || ENV['SITE_LICENCE_URL'] || "https://creativecommons.org/licenses/by/4.0/"
+      metadata["rights_list"] = [{ value: metadata["license_name"], rights_uri: metadata["license_url"] }]
 
       metadata["subjects"] = Array(metadata["tags"]).select { |t| t != "featured" }
 
@@ -172,9 +172,11 @@ module Cirneco
       metadata["contributors"] = [{ literal: contributor, contributor_type: "HostingInstitution" }]
 
       metadata["date_issued"] = metadata["date"]
+      metadata["publication_month"] = metadata["date"][5..6]
+      metadata["publication_day"] = metadata["date"][8..9]
 
       metadata = metadata.extract!(*%w(doi url creators title publisher
-        publication_year resource_type descriptions version rights_list subjects contributors
+        publication_year publication_month publication_day resource_type descriptions version license_name license_url rights_list subjects contributors
         date_issued related_identifiers))
     end
 
@@ -198,5 +200,9 @@ module Cirneco
 
       work.delete_metadata(metadata["doi"], options)
     end
+
+    def generate_jats(filepath, options={})
+      Bergamasco::Pandoc.write_jats(filepath, options)
+    end
   end
 end

data/lib/cirneco/version.rb

@@ -1,3 +1,3 @@
 module Cirneco
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/spec/fixtures/cool-dois.yml

@@ -7,3 +7,4 @@ tags:
 - doi
 - featured
 image: https://blog.datacite.org/images/2016/12/cool-dois.png
+---

data/spec/utils_spec.rb

@@ -112,5 +112,14 @@ describe Cirneco::DataCenter, vcr: true, :order => :defined do
       expect(response.body["data"]).to eq("OK")
       expect(response.status).to eq(200)
     end
+
+    # it 'should generate jats xml' do
+    #   filepath = fixture_path + 'cool-dois.html.md'
+    #   number = 123
+    #   options = { csl: 'spec/fixtures/apa.csl', bibliography: 'spec/fixtures/references.yaml' }
+    #   metadata = subject.generate_metadata_for_work(filepath, options)
+    #   xml_path = subject.generate_jats(filepath, options.merge(metadata: metadata))
+    #   expect(xml_path).to eq(fixture_path + 'cool-dois.xml')
+    # end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cirneco
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2016-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: base32-crockford-checksum
   requirement: !ruby/object:Gem::Requirement