cirneco 0.9.9 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 977e01bece7a6b13b9ab899296595d456f327155
-  data.tar.gz: 1866e6bd450420a19388117cd633ebe77d28db89
+  metadata.gz: ba54856720e148fbd651935fb11b291f3a847587
+  data.tar.gz: e8d37feb201d2090e0036e03ad7cb5ee2af6c287
 SHA512:
-  metadata.gz: e27bdd14dfa0d81ac5c5e5c670c0772c19a7f61815f9422073200ce830ec123a989fcf99591b7654f0ea298e0f517c9bb1572bedf993730c85ce6c88e249f743
-  data.tar.gz: e2b994a8959c40c627d4c6d8ab7658c1fd0460b193a3d9b39cef00b68f5777815b1e3b50b8690099bc156ad60617e2e5a251a84adb64592997b3170e946ac832
+  metadata.gz: 6ba7f30ecb5b6ac6984ffa21436cdd19a3a26ef68dcd54a0053cb03f98d54a128a600a7141e815c492b1696a66c32826a3fdf0d9850c0ab8aa50a2a2017a2c2b
+  data.tar.gz: 3285770a11b8065c8033f24a8eba5e9e542c7f46e88db948384fbd62257e42f3f2fa637de12ceb90ec3c9e62185a666b98927d6863025761d8e51c20df1665ef

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cirneco (0.9.9)
+    cirneco (0.9.10)
       activesupport (~> 4.2, >= 4.2.5)
       base32-crockford-checksum (~> 0.2.2)
       bergamasco (~> 0.3)
@@ -22,7 +22,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.3.8)
     base32-crockford-checksum (0.2.3)
-    bergamasco (0.3.10)
+    bergamasco (0.3.11)
       activesupport (~> 4.2, >= 4.2.5)
       addressable (~> 2.3.8)
       builder (~> 3.2, >= 3.2.2)

data/lib/cirneco/utils.rb

@@ -108,12 +108,12 @@ module Cirneco
       filename, build_path, source_path = filepath_from_url(url, options)
 
       metadata = generate_metadata_for_work(build_path, options)
-      return "DOI #{metadata["doi"]} not changed for #{filename}" if metadata["doi"] && metadata["date_issued"]
+      return "DOI #{metadata["doi"]} not changed for #{filename}" if metadata["doi"] && metadata["date_updated"] == metadata["date_issued"]
 
       response = post_metadata_for_work(metadata, options)
       return "Errors for DOI #{metadata["doi"]}: #{response.body['errors'].first['title']}\n" if response.body['errors'].present?
 
-      new_metadata = Bergamasco::Markdown.update_file(source_path, "doi" => metadata["doi"], "published" => true)
+      new_metadata = Bergamasco::Markdown.update_file(source_path, "doi" => metadata["doi"], "date" => metadata["date_updated"])
       "DOI #{new_metadata["doi"]} minted for #{filename}"
     end
 
@@ -122,12 +122,12 @@ module Cirneco
       filename, build_path, source_path = filepath_from_url(url, options)
 
       metadata = generate_metadata_for_work(build_path, options)
-      return "DOI #{metadata["doi"]} not changed for #{filename}" if metadata["doi"] && metadata["date_issued"]
+      return "DOI #{metadata["doi"]} not changed for #{filename}" if metadata["doi"] && metadata["date_updated"] == metadata["date_issued"]
 
       response = post_metadata_for_work(metadata, options)
       return "Errors for DOI #{metadata["doi"]}: #{response.body['errors'].first['title']}\n" if response.body['errors'].present?
 
-      new_metadata = Bergamasco::Markdown.update_file(source_path, "doi" => metadata["doi"], "published" => false)
+      new_metadata = Bergamasco::Markdown.update_file(source_path, "doi" => metadata["doi"], "date" => metadata["date_updated"])
       "DOI #{new_metadata["doi"]} minted and hidden for #{filename}"
     end
 
@@ -183,7 +183,7 @@ module Cirneco
       return { "error" => "Error: no schema.org metadata found" } unless json.present?
 
       metadata = ActiveSupport::JSON.decode(json.text)
-
+      return { "error" => "Error: blog post not published" } if metadata["published"].to_s == "false"
       return { "error" => "Error: required metadata missing" } unless ["name", "author", "publisher", "datePublished", "@type"].all? { |k| metadata.key? k }
 
       # required metadata
@@ -197,7 +197,7 @@ module Cirneco
       metadata["creators"] = format_authors(metadata["author"])
 
       metadata["publisher"] = metadata.fetch("publisher", {}).fetch("name", nil)
-      metadata["publication_year"] = metadata.fetch("datePublished", "")[0..3].to_i
+      metadata["publication_year"] = metadata["datePublished"][0..3].to_i
 
       resource_type_general = case metadata["@type"]
         when "Dataset" then "Dataset"
@@ -309,7 +309,7 @@ module Cirneco
       return { "error" => "Error: no schema.org metadata found" } unless json.present?
 
       metadata = ActiveSupport::JSON.decode(json.text)
-
+      return { "error" => "Error: blog post not published" } if metadata["published"].to_s == "false"
       return { "error" => "Error: required metadata missing" } unless ["name", "author", "publisher", "datePublished", "@type"].all? { |k| metadata.key? k }
 
       # required metadata

data/lib/cirneco/version.rb

@@ -1,3 +1,3 @@
 module Cirneco
-  VERSION = "0.9.9"
+  VERSION = "0.9.10"
 end

data/spec/api_spec.rb

@@ -75,6 +75,11 @@ describe Cirneco::Work, vcr: true, :order => :defined do
         expect(response.body["data"]).to eq("http://www.datacite.org")
       end
 
+      it 'should get doi not found' do
+        response = subject.get_doi("10.5072/0000-03V", options)
+        expect(response.status).to eq(404)
+      end
+
       it 'username missing' do
         options = { username: username, sandbox: true }
         response = subject.get_doi(doi, options)

data/spec/fixtures/cool-dois.html.md

@@ -2,7 +2,7 @@
 layout: post
 title: Cool DOI's
 author: mfenner
-date: 2016-12-15
+date: '2016-12-15'
 tags:
 - doi
 - featured

data/spec/fixtures/index.html.erb

@@ -6,7 +6,7 @@ author:
 - lrueda
 - kgarza
 - mfenner
-date: 2015-08-03
+date: '2015-08-03'
 accession_number: MS-25-1785
 doi: 10.5072/0000-00SS
 published: false

data/spec/fixtures/vcr_cassettes/Cirneco_Work/DOI_API/get/should_get_doi_not_found.yml

@@ -0,0 +1,44 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://mds-sandbox.datacite.org/doi/10.5072/0000-03V
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Maremma - https://github.com/datacite/maremma
+      Accept:
+      - text/html,application/json,application/xml;q=0.9, text/plain;q=0.8,image/png,*/*;q=0.5
+      Authorization:
+      - Basic <MDS_TOKEN>
+  response:
+    status:
+      code: 404
+      message: ''
+    headers:
+      Server:
+      - openresty/1.11.2.1
+      Date:
+      - Tue, 03 Jan 2017 21:51:50 GMT
+      Content-Length:
+      - '13'
+      Connection:
+      - keep-alive
+      Pragma:
+      - no-cache
+      Expires:
+      - Thu, 01 Jan 1970 00:00:00 GMT
+      Cache-Control:
+      - no-cache, no-store
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Methods:
+      - GET, POST, OPTIONS
+    body:
+      encoding: UTF-8
+      string: DOI not found
+    http_version: 
+  recorded_at: Tue, 03 Jan 2017 21:51:50 GMT
+recorded_with: VCR 3.0.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cirneco
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -418,6 +418,7 @@ files:
 - spec/fixtures/vcr_cassettes/Cirneco_Doi/mint_and_hide_DOIs/mints_dois_for_list_of_urls.yml
 - spec/fixtures/vcr_cassettes/Cirneco_Work/DOI_API/get/should_get_all_dois.yml
 - spec/fixtures/vcr_cassettes/Cirneco_Work/DOI_API/get/should_get_doi.yml
+- spec/fixtures/vcr_cassettes/Cirneco_Work/DOI_API/get/should_get_doi_not_found.yml
 - spec/fixtures/vcr_cassettes/Cirneco_Work/DOI_API/put/should_put_doi.yml
 - spec/fixtures/vcr_cassettes/Cirneco_Work/Media_API/get/should_get_media.yml
 - spec/fixtures/vcr_cassettes/Cirneco_Work/Media_API/post/should_post_media.yml