cirneco 0.8.6 → 0.8.7

data/spec/fixtures/vcr_cassettes/Cirneco_Work/Media_API/post/should_post_media.yml

@@ -23,7 +23,7 @@ http_interactions:
       Server:
       - openresty/1.11.2.1
       Date:
-      - Sun, 01 Jan 2017 15:59:26 GMT
+      - Mon, 02 Jan 2017 09:16:09 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Connection:
@@ -42,5 +42,5 @@ http_interactions:
       encoding: UTF-8
       string: OK
     http_version: 
-  recorded_at: Sun, 01 Jan 2017 15:59:26 GMT
+  recorded_at: Mon, 02 Jan 2017 09:16:09 GMT
 recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Cirneco_Work/Metadata_API/delete/should_delete_metadata.yml

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

data/spec/fixtures/vcr_cassettes/Cirneco_Work/Metadata_API/get/should_get_metadata.yml

@@ -21,7 +21,7 @@ http_interactions:
       Server:
       - openresty/1.11.2.1
       Date:
-      - Sun, 01 Jan 2017 15:59:25 GMT
+      - Mon, 02 Jan 2017 09:16:07 GMT
       Content-Type:
       - application/xml;charset=UTF-8
       Content-Length:
@@ -61,5 +61,5 @@ http_interactions:
           <dates/>
         </resource>
     http_version: 
-  recorded_at: Sun, 01 Jan 2017 15:59:25 GMT
+  recorded_at: Mon, 02 Jan 2017 09:16:07 GMT
 recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Cirneco_Work/Metadata_API/post/should_post_metadata.yml

@@ -42,7 +42,7 @@ http_interactions:
       Server:
       - openresty/1.11.2.1
       Date:
-      - Sun, 01 Jan 2017 15:59:25 GMT
+      - Mon, 02 Jan 2017 09:16:07 GMT
       Content-Type:
       - text/html;charset=UTF-8
       Connection:
@@ -63,5 +63,5 @@ http_interactions:
       encoding: UTF-8
       string: OK (10.5072/0000-03VC)
     http_version: 
-  recorded_at: Sun, 01 Jan 2017 15:59:25 GMT
+  recorded_at: Mon, 02 Jan 2017 09:16:07 GMT
 recorded_with: VCR 3.0.3

data/spec/utils_spec.rb

@@ -4,10 +4,12 @@ describe Cirneco::DataCenter, vcr: true, :order => :defined do
   let(:prefix) { ENV['PREFIX'] }
   let(:username) { ENV['MDS_USERNAME'] }
   let(:password) { ENV['MDS_PASSWORD'] }
+  let(:source_dir) { "/spec/fixtures/" }
   let(:options) { { username: username,
                     password: password,
                     sandbox: true,
-                    source_path: "/spec/fixtures/" } }
+                    index_dir: source_dir,
+                    source_dir: source_dir } }
 
   subject { Cirneco::DataCenter.new(prefix: prefix,
                                     username: username,
@@ -17,8 +19,8 @@ describe Cirneco::DataCenter, vcr: true, :order => :defined do
     it 'should get all dois by prefix' do
       response = subject.get_dois_by_prefix(prefix, options)
       dois = response.body["data"]
-      expect(dois.length).to eq(64)
-      expect(dois.first).to eq("10.5072/0000-03VC")
+      expect(dois.length).to eq(76)
+      expect(dois.first).to eq("10.5072/0000-00SS")
     end
   end
 
@@ -111,7 +113,7 @@ describe Cirneco::DataCenter, vcr: true, :order => :defined do
     it 'get urls for works' do
       filepath = fixture_path + 'index.html'
       response = subject.get_urls_for_works(filepath)
-      expect(response.length).to eq(66)
+      expect(response.length).to eq(2)
     end
 
     it 'should mint for url' do
@@ -133,21 +135,21 @@ describe Cirneco::DataCenter, vcr: true, :order => :defined do
     end
 
     it 'should mint for all urls' do
-      filepath = fixture_path + 'cool-dois.html'
-      response = subject.mint_dois_for_all_urls([filepath], options)
-      expect(response).to eq("DOI 10.5072/0000-03VC minted for cool-dois.html")
+      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")
     end
 
     it 'should hide for all urls' do
-      filepath = fixture_path + 'cool-dois-minted.html'
-      response = subject.hide_dois_for_all_urls([filepath], options)
-      expect(response).to eq("DOI 10.5072/0000-03WD hidden for cool-dois-minted.html")
+      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")
     end
 
     it 'should mint and hide for all urls' do
-      filepath = fixture_path + 'cool-dois.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")
+      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")
     end
 
     it 'should generate metadata for work' do
@@ -198,4 +200,52 @@ describe Cirneco::DataCenter, vcr: true, :order => :defined do
     #   expect(xml_path).to eq(fixture_path + 'cool-dois.xml')
     # end
   end
+
+  context "filepath from url" do
+    it 'https://blog.datacite.org/' do
+      url = 'https://blog.datacite.org/'
+      filename, build_path, source_path = subject.filepath_from_url(url, index_dir: source_dir)
+      expect(filename).to eq("index.html")
+      expect(source_path).to eq(fixture_path + "index.html.erb")
+      expect(build_path).to eq(fixture_path + "index.html")
+    end
+
+    it 'https://blog.datacite.org' do
+      url = 'https://blog.datacite.org'
+      filename, build_path, source_path = subject.filepath_from_url(url, index_dir: source_dir)
+      expect(filename).to eq("index.html")
+      expect(source_path).to eq(fixture_path + "index.html.erb")
+      expect(build_path).to eq(fixture_path + "index.html")
+    end
+
+    it 'index.html' do
+      url = fixture_path + 'index.html'
+      filename, build_path, source_path = subject.filepath_from_url(url, index_dir: source_dir)
+      expect(filename).to eq("index.html")
+      expect(source_path).to eq(fixture_path + "index.html.erb")
+      expect(build_path).to eq(fixture_path + "index.html")
+    end
+
+    it 'index.html basename' do
+      url = 'index.html'
+      filename, build_path, source_path = subject.filepath_from_url(url, index_dir: source_dir)
+      expect(filename).to eq("index.html")
+      expect(source_path).to eq(fixture_path + "index.html.erb")
+      expect(build_path).to eq(fixture_path + "index.html")
+    end
+
+    it 'cool-dois.html' do
+      url = fixture_path + 'cool-dois.html'
+      filename, build_path, source_path = subject.filepath_from_url(url, source_dir: source_dir)
+      expect(source_path).to eq(fixture_path + "cool-dois.html.md")
+      expect(build_path).to eq(fixture_path + "cool-dois.html")
+    end
+
+    it 'cool-dois.html basename' do
+      url = 'cool-dois.html'
+      filename, build_path, source_path = subject.filepath_from_url(url, source_dir: source_dir)
+      expect(source_path).to eq(fixture_path + "cool-dois.html.md")
+      expect(build_path).to eq(fixture_path + "cool-dois.html")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cirneco
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-01 00:00:00.000000000 Z
+date: 2017-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -355,7 +355,9 @@ files:
 - spec/fixtures/cool-dois.html
 - spec/fixtures/cool-dois.html.md
 - spec/fixtures/cool-dois.yml
+- spec/fixtures/index-minted.html
 - spec/fixtures/index.html
+- spec/fixtures/index.html.erb
 - spec/fixtures/references.bib
 - spec/fixtures/references.yaml
 - spec/fixtures/site.yml
@@ -372,7 +374,6 @@ files:
 - spec/fixtures/vcr_cassettes/Cirneco_Doi/MDS_DOI_API/get/should_get_doi.yml
 - spec/fixtures/vcr_cassettes/Cirneco_Doi/MDS_DOI_API/put/should_put_doi.yml
 - spec/fixtures/vcr_cassettes/Cirneco_Doi/mint_and_hide_DOIs/hides_a_doi.yml
-- spec/fixtures/vcr_cassettes/Cirneco_Doi/mint_and_hide_DOIs/hides_dois_for_list_of_urls.yml
 - spec/fixtures/vcr_cassettes/Cirneco_Doi/mint_and_hide_DOIs/mints_a_doi.yml
 - spec/fixtures/vcr_cassettes/Cirneco_Doi/mint_and_hide_DOIs/mints_and_hides_a_doi.yml
 - spec/fixtures/vcr_cassettes/Cirneco_Doi/mint_and_hide_DOIs/mints_and_hides_dois_for_list_of_urls.yml

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

@@ -1,44 +0,0 @@
----
-http_interactions:
-- request:
-    method: delete
-    uri: https://mds-sandbox.datacite.org/metadata/10.5072/0000-03WD
-    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: 200
-      message: ''
-    headers:
-      Server:
-      - openresty/1.11.2.1
-      Date:
-      - Sun, 01 Jan 2017 16:05:18 GMT
-      Content-Type:
-      - text/html;charset=UTF-8
-      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: OK
-    http_version: 
-  recorded_at: Sun, 01 Jan 2017 16:05:18 GMT
-recorded_with: VCR 3.0.3