cirneco 0.8.9 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c54d706925809957c6b2e13498ef108a1dd6f97
-  data.tar.gz: b749d9f09ce922be14766ec1e088ddd3a44af503
+  metadata.gz: 38d157f3d9e0e894960de042f6b8f6073630ef84
+  data.tar.gz: 93e74d210a239655c572c127ee3f1293ea3d1b6a
 SHA512:
-  metadata.gz: 1c101766fe5bf96673fc4b2fbfd602f6d71c5ca93541aa5557c95fbd2b3f7725eb98f752806212f31d2c2b89511e1a9b1175a8ac07dbe080b09eceb093432808
-  data.tar.gz: 2a03c0d808979285bcf72e704bdc2ee23624cc3e2ad675eff0ea201f1256654dc4b78dd2b1251a4f934fb29cd88a5731733708ba334ff9e7e27218e000464225
+  metadata.gz: d560c71918c3697a2ee12092fd4afe25c926f06110c81745b591c401a81506a56efb0db744c2e87715bde25c7618132549721a0ee7cfe803d3b08891618c1947
+  data.tar.gz: 0a4be3110277f083fe05792e6bd0c74171f91181693ca0a119dbdcfa3fb21632b32a499213e9c4000f31d7d662a02155eebf1f9c13558193571274f83adf9d08

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cirneco (0.8.9)
+    cirneco (0.8.10)
       activesupport (~> 4.2, >= 4.2.5)
       base32-crockford-checksum (~> 0.2.2)
       bergamasco (~> 0.3)

data/lib/cirneco/utils.rb

@@ -333,15 +333,18 @@ module Cirneco
         url = response.headers.fetch("Location", "")
       end
 
-      uri = Addressable::URI.parse(url.gsub(/\/$/, ""))
-      filename = (File.basename(uri.path, ".html").presence || "index") + ".html"
-
-      if filename == "index.html"
-        source_path = Dir.pwd + options[:source_dir].to_s + filename + ".erb"
-        build_path = Dir.pwd + options[:build_dir].to_s + filename
+      url.slice!(Dir.pwd + options[:build_dir].to_s)
+      uri = Addressable::URI.parse(url.gsub(/index\.html$/, "").gsub(/\/$/, ""))
+      basename = File.basename(uri.path, ".html").presence || "index"
+
+      if basename.starts_with?("index")
+        filename = basename + ".html.erb"
+        source_path = Dir.pwd + options[:source_dir].to_s + filename
+        build_path = Dir.pwd + options[:build_dir].to_s + basename + ".html"
       else
-        source_path = Dir.pwd + options[:source_dir].to_s + options[:posts_dir].to_s + filename + ".md"
-        build_path = Dir.pwd + options[:build_dir].to_s + options[:posts_dir].to_s + filename
+        filename = basename + ".html.md"
+        source_path = Dir.pwd + options[:source_dir].to_s + options[:posts_dir].to_s + filename
+        build_path = Dir.pwd + options[:build_dir].to_s + basename + "/index.html"
       end
       [filename, build_path, source_path]
     end

data/lib/cirneco/version.rb

@@ -1,3 +1,3 @@
 module Cirneco
-  VERSION = "0.8.9"
+  VERSION = "0.8.10"
 end

data/spec/doi_spec.rb

@@ -10,7 +10,7 @@ describe Cirneco::Doi do
   let(:prefix) { ENV['PREFIX'] }
   let(:doi) { "10.5072/0000-03VC" }
   let(:url) { "http://www.datacite.org" }
-  let(:filename) { 'cool-dois.html' }
+  let(:filename) { 'cool-dois/index.html' }
   let(:filepath) { fixture_path + filename }
   let(:username) { ENV['MDS_USERNAME'] }
   let(:password) { ENV['MDS_PASSWORD'] }
@@ -89,37 +89,37 @@ describe Cirneco::Doi do
   context "mint and hide DOIs", vcr: true, :order => :defined do
     it 'mints a doi' do
       subject.options = mint_options
-      expect { subject.mint filepath }.to output("DOI 10.5072/0000-03VC minted for #{filename}\n").to_stdout
+      expect { subject.mint filepath }.to output("DOI 10.5072/0000-03VC minted for cool-dois.html.md\n").to_stdout
     end
 
     it 'hides a doi' do
-      filename = 'cool-dois-minted.html'
+      filename = 'cool-dois-minted/index.html'
       filepath = fixture_path + filename
       subject.options = mint_options.merge(filepath: filepath)
-      expect { subject.hide filepath }.to output("DOI 10.5072/0000-03WD hidden for #{filename}\n").to_stdout
+      expect { subject.hide filepath }.to output("DOI 10.5072/0000-03WD hidden for cool-dois-minted.html.md\n").to_stdout
     end
 
     it 'mints and hides a doi' do
       subject.options = mint_options
-      expect { subject.mint_and_hide filepath }.to output("DOI 10.5072/0000-03VC minted and hidden for #{filename}\n").to_stdout
+      expect { subject.mint_and_hide filepath }.to output("DOI 10.5072/0000-03VC minted and hidden for cool-dois.html.md\n").to_stdout
     end
 
     it 'mints dois for list of urls' do
       filepath = fixture_path + 'index.html'
       subject.options = mint_options
-      expect { subject.mint filepath }.to output("DOI 10.5072/0000-03VC minted for cool-dois.html\nDOI 10.5072/0000-00SS minted for index.html\n").to_stdout
+      expect { subject.mint filepath }.to output("DOI 10.5072/0000-03VC minted for cool-dois.html.md\nDOI 10.5072/0000-00SS minted for index.html.erb\n").to_stdout
     end
 
     it 'hides dois for list of urls' do
       filepath = fixture_path + 'index.html'
       subject.options = mint_options
-      expect { subject.hide filepath }.to output("No DOI for cool-dois.html\nNo DOI for index.html\n").to_stdout
+      expect { subject.hide filepath }.to output("No DOI for cool-dois.html.md\nNo DOI for index.html.erb\n").to_stdout
     end
 
     it 'mints and hides dois for list of urls' do
       filepath = fixture_path + 'index.html'
       subject.options = mint_options
-      expect { subject.mint_and_hide filepath }.to output("DOI 10.5072/0000-03VC minted and hidden for cool-dois.html\nDOI 10.5072/0000-00SS minted and hidden for index.html\n").to_stdout
+      expect { subject.mint_and_hide filepath }.to output("DOI 10.5072/0000-03VC minted and hidden for cool-dois.html.md\nDOI 10.5072/0000-00SS minted and hidden for index.html.erb\n").to_stdout
     end
   end
 end

data/spec/fixtures/vcr_cassettes/Cirneco_DataCenter/mint_and_hide_DOIs/should_mint_and_hide_for_url.yml

@@ -60,7 +60,7 @@ http_interactions:
       Server:
       - openresty/1.11.2.1
       Date:
-      - Mon, 02 Jan 2017 09:16:14 GMT
+      - Mon, 02 Jan 2017 11:18:15 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Connection:
@@ -81,7 +81,7 @@ http_interactions:
       encoding: UTF-8
       string: OK (10.5072/0000-03VC)
     http_version: 
-  recorded_at: Mon, 02 Jan 2017 09:16:14 GMT
+  recorded_at: Mon, 02 Jan 2017 11:18:15 GMT
 - request:
     method: put
     uri: https://mds-sandbox.datacite.org/doi/10.5072/0000-03VC
@@ -107,7 +107,7 @@ http_interactions:
       Server:
       - openresty/1.11.2.1
       Date:
-      - Mon, 02 Jan 2017 09:16:15 GMT
+      - Mon, 02 Jan 2017 11:18:15 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Connection:
@@ -126,5 +126,5 @@ http_interactions:
       encoding: UTF-8
       string: OK
     http_version: 
-  recorded_at: Mon, 02 Jan 2017 09:16:15 GMT
+  recorded_at: Mon, 02 Jan 2017 11:18:15 GMT
 recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Cirneco_DataCenter/mint_and_hide_DOIs/should_mint_for_url.yml

@@ -60,7 +60,7 @@ http_interactions:
       Server:
       - openresty/1.11.2.1
       Date:
-      - Mon, 02 Jan 2017 09:16:13 GMT
+      - Mon, 02 Jan 2017 11:18:14 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Connection:
@@ -81,7 +81,7 @@ http_interactions:
       encoding: UTF-8
       string: OK (10.5072/0000-03VC)
     http_version: 
-  recorded_at: Mon, 02 Jan 2017 09:16:13 GMT
+  recorded_at: Mon, 02 Jan 2017 11:18:14 GMT
 - request:
     method: put
     uri: https://mds-sandbox.datacite.org/doi/10.5072/0000-03VC
@@ -107,7 +107,7 @@ http_interactions:
       Server:
       - openresty/1.11.2.1
       Date:
-      - Mon, 02 Jan 2017 09:16:14 GMT
+      - Mon, 02 Jan 2017 11:18:14 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Connection:
@@ -126,5 +126,5 @@ http_interactions:
       encoding: UTF-8
       string: OK
     http_version: 
-  recorded_at: Mon, 02 Jan 2017 09:16:14 GMT
+  recorded_at: Mon, 02 Jan 2017 11:18:14 GMT
 recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Cirneco_Doi/mint_and_hide_DOIs/hides_a_doi.yml

@@ -21,7 +21,7 @@ http_interactions:
       Server:
       - openresty/1.11.2.1
       Date:
-      - Mon, 02 Jan 2017 09:16:06 GMT
+      - Mon, 02 Jan 2017 11:19:24 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Connection:
@@ -40,5 +40,5 @@ http_interactions:
       encoding: UTF-8
       string: OK
     http_version: 
-  recorded_at: Mon, 02 Jan 2017 09:16:06 GMT
+  recorded_at: Mon, 02 Jan 2017 11:19:24 GMT
 recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Cirneco_Doi/mint_and_hide_DOIs/mints_a_doi.yml

@@ -60,7 +60,7 @@ http_interactions:
       Server:
       - openresty/1.11.2.1
       Date:
-      - Mon, 02 Jan 2017 09:16:05 GMT
+      - Mon, 02 Jan 2017 11:19:23 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Connection:
@@ -81,7 +81,7 @@ http_interactions:
       encoding: UTF-8
       string: OK (10.5072/0000-03VC)
     http_version: 
-  recorded_at: Mon, 02 Jan 2017 09:16:05 GMT
+  recorded_at: Mon, 02 Jan 2017 11:19:23 GMT
 - request:
     method: put
     uri: https://mds-sandbox.datacite.org/doi/10.5072/0000-03VC
@@ -107,7 +107,7 @@ http_interactions:
       Server:
       - openresty/1.11.2.1
       Date:
-      - Mon, 02 Jan 2017 09:16:06 GMT
+      - Mon, 02 Jan 2017 11:19:23 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Connection:
@@ -126,5 +126,5 @@ http_interactions:
       encoding: UTF-8
       string: OK
     http_version: 
-  recorded_at: Mon, 02 Jan 2017 09:16:06 GMT
+  recorded_at: Mon, 02 Jan 2017 11:19:24 GMT
 recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Cirneco_Doi/mint_and_hide_DOIs/mints_and_hides_a_doi.yml

@@ -60,7 +60,7 @@ http_interactions:
       Server:
       - openresty/1.11.2.1
       Date:
-      - Mon, 02 Jan 2017 09:16:07 GMT
+      - Mon, 02 Jan 2017 11:19:25 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Connection:
@@ -81,7 +81,7 @@ http_interactions:
       encoding: UTF-8
       string: OK (10.5072/0000-03VC)
     http_version: 
-  recorded_at: Mon, 02 Jan 2017 09:16:07 GMT
+  recorded_at: Mon, 02 Jan 2017 11:19:25 GMT
 - request:
     method: put
     uri: https://mds-sandbox.datacite.org/doi/10.5072/0000-03VC
@@ -107,7 +107,7 @@ http_interactions:
       Server:
       - openresty/1.11.2.1
       Date:
-      - Mon, 02 Jan 2017 09:16:07 GMT
+      - Mon, 02 Jan 2017 11:19:25 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Connection:
@@ -126,5 +126,5 @@ http_interactions:
       encoding: UTF-8
       string: OK
     http_version: 
-  recorded_at: Mon, 02 Jan 2017 09:16:07 GMT
+  recorded_at: Mon, 02 Jan 2017 11:19:26 GMT
 recorded_with: VCR 3.0.3

data/spec/utils_spec.rb

@@ -117,43 +117,43 @@ describe Cirneco::DataCenter, vcr: true, :order => :defined do
     end
 
     it 'should mint for url' do
-      filepath = fixture_path + 'cool-dois.html'
+      filepath = fixture_path + 'cool-dois/index.html'
       response = subject.mint_doi_for_url(filepath, options)
-      expect(response).to eq("DOI 10.5072/0000-03VC minted for cool-dois.html")
+      expect(response).to eq("DOI 10.5072/0000-03VC minted for cool-dois.html.md")
     end
 
     it 'should hide for url' do
       filepath = fixture_path + 'cool-dois-minted.html'
       response = subject.hide_doi_for_url(filepath, options)
-      expect(response).to eq("DOI 10.5072/0000-03WD hidden for cool-dois-minted.html")
+      expect(response).to eq("DOI 10.5072/0000-03WD hidden for cool-dois-minted.html.md")
     end
 
     it 'should mint and hide for url' do
-      filepath = fixture_path + 'cool-dois.html'
+      filepath = fixture_path + 'cool-dois/index.html'
       response = subject.mint_and_hide_doi_for_url(filepath, options)
-      expect(response).to eq("DOI 10.5072/0000-03VC minted and hidden for cool-dois.html")
+      expect(response).to eq("DOI 10.5072/0000-03VC minted and hidden for cool-dois.html.md")
     end
 
     it 'should mint for all urls' do
       filepath = fixture_path + 'index.html'
       response = subject.mint_dois_for_all_urls(filepath, options)
-      expect(response).to eq("DOI 10.5072/0000-03VC minted for cool-dois.html\nDOI 10.5072/0000-00SS minted for index.html")
+      expect(response).to eq("DOI 10.5072/0000-03VC minted for cool-dois.html.md\nDOI 10.5072/0000-00SS minted for index.html.erb")
     end
 
     it 'should hide for all urls' do
       filepath = fixture_path + 'index-minted.html'
       response = subject.hide_dois_for_all_urls(filepath, options)
-      expect(response).to eq("No DOI for cool-dois.html\nErrors for DOI 10.5072/0000-NW90: Not found\n")
+      expect(response).to eq("No DOI for cool-dois.html.md\nErrors for DOI 10.5072/0000-NW90: Not found\n")
     end
 
     it 'should mint and hide for all urls' do
       filepath = fixture_path + 'index.html'
       response = subject.mint_and_hide_dois_for_all_urls(filepath, options)
-      expect(response).to eq("DOI 10.5072/0000-03VC minted and hidden for cool-dois.html\nDOI 10.5072/0000-00SS minted and hidden for index.html")
+      expect(response).to eq("DOI 10.5072/0000-03VC minted and hidden for cool-dois.html.md\nDOI 10.5072/0000-00SS minted and hidden for index.html.erb")
     end
 
     it 'should generate metadata for work' do
-      filepath = fixture_path + 'cool-dois.html'
+      filepath = fixture_path + 'cool-dois/index.html'
       metadata = subject.generate_metadata_for_work(filepath)
       expect(metadata["url"]).to eq("https://blog.datacite.org/cool-dois/")
       expect(metadata["creators"]).to eq([{:given_name=>"Martin", :family_name=>"Fenner", :orcid=>"0000-0003-1419-2405"}])
@@ -167,17 +167,17 @@ describe Cirneco::DataCenter, vcr: true, :order => :defined do
     end
 
     it 'should generate metadata for work no JSON-LD' do
-      filepath = fixture_path + 'cool-dois-no-json-ld.html'
+      filepath = fixture_path + 'cool-dois-no-json-ld/index.html'
       expect(subject.generate_metadata_for_work(filepath)).to eq("Error: no schema.org metadata found")
     end
 
     it 'should generate metadata for work missing required metadata' do
-      filepath = fixture_path + 'cool-dois-missing-metadata.html'
+      filepath = fixture_path + 'cool-dois-missing-metadata/index.html'
       expect(subject.generate_metadata_for_work(filepath)).to eq("Error: required metadata missing")
     end
 
     it 'should post_metadata_for_work' do
-      filepath = fixture_path + 'cool-dois.html'
+      filepath = fixture_path + 'cool-dois/index.html'
       metadata = subject.generate_metadata_for_work(filepath)
       response = subject.post_metadata_for_work(metadata, options)
       expect(response.body["data"]).to eq("OK")
@@ -185,7 +185,7 @@ describe Cirneco::DataCenter, vcr: true, :order => :defined do
     end
 
     it 'should hide_metadata_for_work' do
-      filepath = fixture_path + 'cool-dois.html'
+      filepath = fixture_path + 'cool-dois/index.html'
       metadata = subject.generate_metadata_for_work(filepath)
       response = subject.hide_metadata_for_work(metadata, options)
       expect(response.body["data"]).to eq("OK")
@@ -205,7 +205,7 @@ describe Cirneco::DataCenter, vcr: true, :order => :defined do
     it 'https://blog.datacite.org/' do
       url = 'https://blog.datacite.org/'
       filename, build_path, source_path = subject.filepath_from_url(url, build_dir: source_dir, source_dir: source_dir)
-      expect(filename).to eq("index.html")
+      expect(filename).to eq("index.html.erb")
       expect(source_path).to eq(fixture_path + "index.html.erb")
       expect(build_path).to eq(fixture_path + "index.html")
     end
@@ -213,7 +213,7 @@ describe Cirneco::DataCenter, vcr: true, :order => :defined do
     it 'https://blog.datacite.org' do
       url = 'https://blog.datacite.org'
       filename, build_path, source_path = subject.filepath_from_url(url, build_dir: source_dir, source_dir: source_dir)
-      expect(filename).to eq("index.html")
+      expect(filename).to eq("index.html.erb")
       expect(source_path).to eq(fixture_path + "index.html.erb")
       expect(build_path).to eq(fixture_path + "index.html")
     end
@@ -221,7 +221,7 @@ describe Cirneco::DataCenter, vcr: true, :order => :defined do
     it 'index.html' do
       url = fixture_path + 'index.html'
       filename, build_path, source_path = subject.filepath_from_url(url, build_dir: source_dir, source_dir: source_dir)
-      expect(filename).to eq("index.html")
+      expect(filename).to eq("index.html.erb")
       expect(source_path).to eq(fixture_path + "index.html.erb")
       expect(build_path).to eq(fixture_path + "index.html")
     end
@@ -229,7 +229,7 @@ describe Cirneco::DataCenter, vcr: true, :order => :defined do
     it 'index.html basename' do
       url = 'index.html'
       filename, build_path, source_path = subject.filepath_from_url(url, build_dir: source_dir, source_dir: source_dir)
-      expect(filename).to eq("index.html")
+      expect(filename).to eq("index.html.erb")
       expect(source_path).to eq(fixture_path + "index.html.erb")
       expect(build_path).to eq(fixture_path + "index.html")
     end
@@ -237,15 +237,17 @@ describe Cirneco::DataCenter, vcr: true, :order => :defined do
     it 'cool-dois.html' do
       url = fixture_path + 'cool-dois.html'
       filename, build_path, source_path = subject.filepath_from_url(url, build_dir: source_dir, source_dir: source_dir)
+      expect(filename).to eq("cool-dois.html.md")
       expect(source_path).to eq(fixture_path + "cool-dois.html.md")
-      expect(build_path).to eq(fixture_path + "cool-dois.html")
+      expect(build_path).to eq(fixture_path + "cool-dois/index.html")
     end
 
     it 'cool-dois.html basename' do
       url = 'cool-dois.html'
       filename, build_path, source_path = subject.filepath_from_url(url, build_dir: source_dir, source_dir: source_dir)
+      expect(filename).to eq("cool-dois.html.md")
       expect(source_path).to eq(fixture_path + "cool-dois.html.md")
-      expect(build_path).to eq(fixture_path + "cool-dois.html")
+      expect(build_path).to eq(fixture_path + "cool-dois/index.html")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cirneco
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors:
 - Martin Fenner
@@ -347,14 +347,14 @@ files:
 - spec/doi_spec.rb
 - spec/fixtures/apa.csl
 - spec/fixtures/authors.yml
-- spec/fixtures/cool-dois-minted.html
 - spec/fixtures/cool-dois-minted.html.md
-- spec/fixtures/cool-dois-missing-metadata.html
+- spec/fixtures/cool-dois-minted/index.html
+- spec/fixtures/cool-dois-missing-metadata/index.html
 - spec/fixtures/cool-dois-no-accession-number.html.md
-- spec/fixtures/cool-dois-no-json-ld.html
-- spec/fixtures/cool-dois.html
+- spec/fixtures/cool-dois-no-json-ld/index.html
 - spec/fixtures/cool-dois.html.md
 - spec/fixtures/cool-dois.yml
+- spec/fixtures/cool-dois/index.html
 - spec/fixtures/index-minted.html
 - spec/fixtures/index.html
 - spec/fixtures/index.html.erb