cirneco 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3883d7039860e18b72e4221f9cc6d2991453971
-  data.tar.gz: 7daac6b6eaaadf0646931d70e8b6bb849280493c
+  metadata.gz: 8c54d706925809957c6b2e13498ef108a1dd6f97
+  data.tar.gz: b749d9f09ce922be14766ec1e088ddd3a44af503
 SHA512:
-  metadata.gz: 5c136aea1e1e0b6b1c6c9fb41e1d154bb679948ae1e659ab73b3463373b7b97bf4ffef0783c6f05f6a797e0c8f2ed56b5d3c6df4309beababbb2b0ddfdce353d
-  data.tar.gz: ca8a76e900f9777db7d04506e56165da8348a658c49c918ea2b4b43126e9cc78aede0ead8950405656de77490578feff31e6ea7c2299381f22ad11c5cff23f3c
+  metadata.gz: 1c101766fe5bf96673fc4b2fbfd602f6d71c5ca93541aa5557c95fbd2b3f7725eb98f752806212f31d2c2b89511e1a9b1175a8ac07dbe080b09eceb093432808
+  data.tar.gz: 2a03c0d808979285bcf72e704bdc2ee23624cc3e2ad675eff0ea201f1256654dc4b78dd2b1251a4f934fb29cd88a5731733708ba334ff9e7e27218e000464225

data/Gemfile.lock

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

data/lib/cirneco/doi.rb

@@ -106,7 +106,8 @@ module Cirneco
     method_option :authorpath, :default => ENV['SITE_AUTHORPATH']
     method_option :referencespath, :default => ENV['SITE_REFERENCESPATH']
     method_option :source_dir, :default => ENV['SOURCE_DIR']
-    method_option :index_dir, :default => ENV['INDEX_DIR']
+    method_option :build_dir, :default => ENV['BUILD_DIR']
+    method_option :posts_dir, :default => ENV['POSTS_DIR']
     method_option :csl, :default => ENV['SITE_CSLPATH']
     method_option :number, :aliases => '-n'
     method_option :username, :default => ENV['MDS_USERNAME']
@@ -123,7 +124,8 @@ module Cirneco
     method_option :authorpath, :default => ENV['SITE_AUTHORPATH']
     method_option :referencespath, :default => ENV['SITE_REFERENCESPATH']
     method_option :source_dir, :default => ENV['SOURCE_DIR']
-    method_option :index_dir, :default => ENV['INDEX_DIR']
+    method_option :build_dir, :default => ENV['BUILD_DIR']
+    method_option :posts_dir, :default => ENV['POSTS_DIR']
     method_option :csl, :default => ENV['SITE_CSLPATH']
     method_option :number, :aliases => '-n'
     method_option :username, :default => ENV['MDS_USERNAME']
@@ -140,7 +142,8 @@ module Cirneco
     method_option :authorpath, :default => ENV['SITE_AUTHORPATH']
     method_option :referencespath, :default => ENV['SITE_REFERENCESPATH']
     method_option :source_dir, :default => ENV['SOURCE_DIR']
-    method_option :index_dir, :default => ENV['INDEX_DIR']
+    method_option :build_dir, :default => ENV['BUILD_DIR']
+    method_option :posts_dir, :default => ENV['POSTS_DIR']
     method_option :csl, :default => ENV['SITE_CSLPATH']
     method_option :bibliography, :default => ENV['SITE_REFERENCESPATH']
     method_option :username, :default => ENV['MDS_USERNAME']

data/lib/cirneco/utils.rb

@@ -197,8 +197,6 @@ module Cirneco
       metadata["publisher"] = metadata.fetch("publisher", {}).fetch("name", nil)
       metadata["publication_year"] = metadata.fetch("datePublished", "")[0..3].to_i
 
-      resource_type_general =
-
       resource_type_general = case metadata["@type"]
         when "Dataset" then "Dataset"
         when "Blog" then "Collection"
@@ -339,13 +337,11 @@ module Cirneco
       filename = (File.basename(uri.path, ".html").presence || "index") + ".html"
 
       if filename == "index.html"
-        index_dir = options[:index_dir].presence || "/"
-        build_path = Dir.pwd + index_dir + filename
-        source_path = build_path + ".erb"
+        source_path = Dir.pwd + options[:source_dir].to_s + filename + ".erb"
+        build_path = Dir.pwd + options[:build_dir].to_s + filename
       else
-        source_dir = options[:source_dir].presence || "/"
-        build_path = Dir.pwd + source_dir + filename
-        source_path = build_path + ".md"
+        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
       end
       [filename, build_path, source_path]
     end

data/lib/cirneco/version.rb

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

data/spec/doi_spec.rb

@@ -17,7 +17,7 @@ describe Cirneco::Doi do
   let(:csl) { "spec/fixtures/apa.csl" }
   let(:bibliography) { "spec/fixtures/bibliography.yaml" }
   let(:api_options) { { username: username, password: password, sandbox: true } }
-  let(:mint_options) { { username: username, password: password, sandbox: true, source_dir: "/spec/fixtures/", index_dir: "/spec/fixtures/", csl: csl, bibliography: bibliography } }
+  let(:mint_options) { { username: username, password: password, sandbox: true, source_dir: "/spec/fixtures/", build_dir: "/spec/fixtures/", csl: csl, bibliography: bibliography } }
 
   describe "MDS DOI API", vcr: true, :order => :defined do
     context "put" do

data/spec/utils_spec.rb

@@ -8,7 +8,7 @@ describe Cirneco::DataCenter, vcr: true, :order => :defined do
   let(:options) { { username: username,
                     password: password,
                     sandbox: true,
-                    index_dir: source_dir,
+                    build_dir: source_dir,
                     source_dir: source_dir } }
 
   subject { Cirneco::DataCenter.new(prefix: prefix,
@@ -204,7 +204,7 @@ describe Cirneco::DataCenter, vcr: true, :order => :defined do
   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)
+      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(source_path).to eq(fixture_path + "index.html.erb")
       expect(build_path).to eq(fixture_path + "index.html")
@@ -212,7 +212,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, index_dir: source_dir)
+      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(source_path).to eq(fixture_path + "index.html.erb")
       expect(build_path).to eq(fixture_path + "index.html")
@@ -220,7 +220,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, index_dir: source_dir)
+      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(source_path).to eq(fixture_path + "index.html.erb")
       expect(build_path).to eq(fixture_path + "index.html")
@@ -228,7 +228,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, index_dir: source_dir)
+      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(source_path).to eq(fixture_path + "index.html.erb")
       expect(build_path).to eq(fixture_path + "index.html")
@@ -236,14 +236,14 @@ 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, source_dir: source_dir)
+      filename, build_path, source_path = subject.filepath_from_url(url, build_dir: source_dir, 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)
+      filename, build_path, source_path = subject.filepath_from_url(url, build_dir: source_dir, 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cirneco
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - Martin Fenner