relaton-cli 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 602dc6b5405f7e9ad64b82a2db8d7c01e1f3de2aa95324a48cb1bef1f5d83394
-  data.tar.gz: 3d59d3c875327a1444f6d95be1d83f9b44e1edb78a40c3e3d1ae62096611f2b3
+  metadata.gz: 7864959606a5a5ea10e2b4dbb7fe2e922662779bdc7b7e56041434269533624e
+  data.tar.gz: a2f45e732d3f90328f5dfabcb2bc74ddf4d3f3d869cf26a57a36bd467089db67
 SHA512:
-  metadata.gz: e0b7c3d7b95e26db2bb8392860e2ccaef744caa588885c285cb2ab472ecadda6d08d1393dd0f093f33d918f705351a1092f8b869940a8ee8aa50267446886849
-  data.tar.gz: 7c91b43960fbd34ee9500524fad1b355f3681960c623dd1af95f637736f577d516107330de97c4b97bf7785fc50b747c198c7f67ca4003fce8309760aa6a207a
+  metadata.gz: 7b686cd2eb16b7b6ffd89cb16d3a1405803b52a080c0f185655f77e4ab6ce88dc9985fcd3f3dbb82da27fac50c932f341a567d5a6eb2860dba24d271595a11fb
+  data.tar.gz: 22775ba4fd0f900d1618c9b731188c5a50a59ba07e760c9c453ed87bbfc8bb574ed044d9c77da7b6216475f01968a0549403fb9a1a2950587fb575ef74af1029

data/lib/relaton/cli/relaton_file.rb

@@ -136,14 +136,18 @@ module Relaton
 
       def split_and_write_to_files
         output_dir = outdir || build_dirname(source)
-        write_to_collection_file(relaton_collection.to_yaml, output_dir)
 
         relaton_collection.items.each do |content|
           name = build_filename(nil, content.docidentifier)
-          write_to_file(content.to_xml, output_dir, name)
+          write_to_file(content.send(output_type), output_dir, name)
         end
       end
 
+      def output_type
+        output_format = options[:extension] || "rxl"
+        (output_format == "rxl" ? "to_xml" : "to_#{output_format}").to_sym
+      end
+
       def bibdata_instance(document, file)
         document = clean_nokogiri_document(document)
         bibdata = Relaton::Bibdata.from_xml(document.root)
@@ -192,10 +196,6 @@ module Relaton
         File.open(file_with_dir, "w:utf-8") { |file| file.write(content) }
       end
 
-      def write_to_collection_file(content, directory)
-        write_to_file(content, directory, build_filename(source, nil, "yaml"))
-      end
-
       def build_dirname(filename)
         basename = File.basename(filename)&.gsub(/.(xml|rxl)/, "")
         directory_name = sanitize_string(basename)
@@ -210,8 +210,13 @@ module Relaton
       end
 
       def sanitize_string(string)
-        string.downcase.gsub("/", " ").gsub(/^\s+/, "").gsub(/\s+$/, "").
-          gsub(/\s+/, "-")
+        clean_string = replace_bad_characters(string.downcase)
+        clean_string.gsub(/^\s+/, "").gsub(/\s+$/, "").gsub(/\s+/, "-")
+      end
+
+      def replace_bad_characters(string)
+        bad_chars = ["/", "\\", "?", "%", "*", ":", "|", '"', "<", ">", ".", " "]
+        bad_chars.inject(string.downcase) { |res, char| res.gsub(char, "-") }
       end
     end
   end

data/lib/relaton/cli/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Cli
-    VERSION = "0.1.8".freeze
+    VERSION = "0.1.9".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-24 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake