relaton-cli 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '080ef2cfe08edfba51c903c9ce1d11bdf888257f'
-  data.tar.gz: 338339afba81aee2d161fa677708a0cff46abe68
+  metadata.gz: 29ee3d1187d6023ead4d9f5cc04bd4bddb7e2931
+  data.tar.gz: bef6cd7d3d4c586f5843386bf2d1ca146cdd013f
 SHA512:
-  metadata.gz: aa6ff088313b823a22ee62c19c0906f718af15f0202ae9785c2b9eaa63d2303c113e0158abe208daa0bb59c68bcd785318bcb253ec2ed9ec28866a08dc915723
-  data.tar.gz: 1b03e8509251c6893c778fb134effc0221bdd0f3c103a5bc06b6064fb9dfd9c8fa0749383657e4a0a088854b6cb89aff7bcc3de14aba542bad2092953efc13da
+  metadata.gz: 78fa395ed259c408f7368170a53459229a6c21efae0f392362eefdb44b9c44a93fa740845bdd7bb87c2787d0bbfbf2500fcc607c7501a2b5f9e61b493ba390a2
+  data.tar.gz: 2594375e739b8d943d16d40079d776807a2bf622bdb46edec7dccabf9f3bf2d699574fec19a5314ef2cc80a0fece75c752d25faf0d148fe9d8626a8a0700ed5b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton-cli (0.3.6)
+    relaton-cli (0.3.7)
       liquid
       relaton (~> 0.5)
       thor
@@ -12,7 +12,7 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     byebug (10.0.2)
-    cnccs (0.1.3)
+    cnccs (0.1.4)
     coderay (1.1.2)
     debase (0.2.3)
       debase-ruby_core_source (>= 0.10.2)
@@ -21,10 +21,10 @@ GEM
     docile (1.3.2)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    faraday (0.15.4)
+    faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
-    gb-agencies (0.0.5)
-    isoics (0.1.7)
+    gb-agencies (0.0.6)
+    isoics (0.1.8)
     json (2.2.0)
     liquid (4.0.3)
     method_source (0.9.2)
@@ -38,7 +38,7 @@ GEM
       method_source (~> 0.9.0)
     public_suffix (4.0.1)
     rake (12.3.3)
-    relaton (0.5.5)
+    relaton (0.5.6)
       relaton-gb (~> 0.6.0)
       relaton-iec (~> 0.4.0)
       relaton-ietf (~> 0.6.0)
@@ -46,31 +46,31 @@ GEM
       relaton-itu (~> 0.3.0)
       relaton-nist (~> 0.3.0)
       relaton-ogc (~> 0.1.0)
-    relaton-bib (0.3.8)
+    relaton-bib (0.3.9)
       addressable
       nokogiri
-    relaton-gb (0.6.4)
+    relaton-gb (0.6.5)
       cnccs (~> 0.1.1)
       gb-agencies (~> 0.0.1)
       relaton-iso-bib (~> 0.3.0)
-    relaton-iec (0.4.6)
+    relaton-iec (0.4.8)
       addressable
       relaton-iso-bib (~> 0.3.0)
-    relaton-ietf (0.6.5)
+    relaton-ietf (0.6.6)
       relaton-bib (~> 0.3.0)
-    relaton-iso (0.6.6)
+    relaton-iso (0.6.7)
       relaton-iec (~> 0.4.0)
       relaton-iso-bib (~> 0.3.0)
-    relaton-iso-bib (0.3.7)
+    relaton-iso-bib (0.3.9)
       isoics (~> 0.1.6)
       relaton-bib (~> 0.3.0)
       ruby_deep_clone (~> 0.8.0)
-    relaton-itu (0.3.4)
+    relaton-itu (0.3.5)
       relaton-iso-bib (~> 0.3.0)
-    relaton-nist (0.3.5)
+    relaton-nist (0.3.6)
       relaton-bib (~> 0.3.0)
       rubyzip
-    relaton-ogc (0.1.1)
+    relaton-ogc (0.1.2)
       faraday
       relaton-iso-bib (~> 0.3.0)
     rspec (3.8.0)

data/docs/README.adoc

@@ -17,7 +17,7 @@ The following executables are included:
 
 [source,console]
 ----
-$ relaton concatenate Source-Directory Collection-File -t TITLE -g ORGANIZATION
+$ relaton concatenate Source-Directory Collection-File -t TITLE -g ORGANIZATION -n
 ----
 
 Iterates through all the Relaton YAML files in `Source-Directory`, and converts them in-place into Relaton XML.
@@ -31,16 +31,20 @@ file), a link to that file is inserted.
 If the `TITLE` or `ORGANIZATION` options are given, they are added to the `Collection-File` output as the
 title and author of the `relaton-collection` document.
 
+If the `-n` or `--new` option given then use the new Relaton YAML format https://github.com/relaton/relaton-bib/blob/master/docs/hash.adoc.
+
 === relaton split
 
 [source,console]
 ----
-$ relaton split Collection-File Relaton-File-Directory -x rxl
+$ relaton split Collection-File Relaton-File-Directory -x rxl -n
 ----
 
 Splits a `Relaton-Collection-File` into multiple files in the `Relaton-File-Directory`, and it also
 suports an addional `extension` options to use different extension.
 
+If the `-n` or `--new` option given then use the new Relaton YAML format https://github.com/relaton/relaton-bib/blob/master/docs/hash.adoc.
+
 === relaton fetch
 
 [source,console]

data/lib/relaton-cli.rb

@@ -3,4 +3,3 @@ require_relative "relaton/bibcollectionnew"
 require_relative "relaton/bibdata"
 require_relative "relaton/element_finder"
 require_relative "relaton/xml_document"
-

data/lib/relaton/bibcollection.rb

@@ -19,9 +19,8 @@ module Relaton
         value = options[k] || options[k.to_s]
         self.send("#{k}=", value)
       end
-      self.items = (self.items || []).inject([]) do |acc,item|
-        acc << if item.is_a?(::Relaton::Bibcollection) ||
-          item.is_a?(::Relaton::Bibdata)
+      self.items = (self.items || []).inject([]) do |acc, item|
+        acc << if item.is_a?(::Relaton::Bibcollection) || item.is_a?(::Relaton::Bibdata)
           item
         else
           new_bib_item_class(item)
@@ -50,9 +49,9 @@ module Relaton
 
     def new_bib_item_class(options)
       if options["items"]
-        ::Relaton::Bibcollection.new(options)
+        options[:new] ? ::Relaton::BibcollectionNew(options) : ::Relaton::Bibcollection.new(options)
       else
-        ::Relaton::Bibdata.new(options)
+        options[:new] ? ::Relaton::BibdataNew(options) : ::Relaton::Bibdata.new(options)
       end
     end
 

data/lib/relaton/bibcollectionnew.rb

@@ -20,8 +20,7 @@ module Relaton
         send("#{k}=", value)
       end
       self.items = (items || []).reduce([]) do |acc, item|
-        acc << if item.is_a?(::Relaton::BibcollectionNew) ||
-            item.class >= ::RelatonBib::BibliographicItem
+        acc << if item.is_a?(::Relaton::BibcollectionNew) || item.is_a?(::Relaton::BibdataNew)
                  item
                else new_bib_item_class(item)
                end
@@ -39,7 +38,7 @@ module Relaton
 
       items = find_xpath("./relaton-collection/relation", source)&.map do |item|
         bibdata = find("./bibdata", item)
-        klass = bibdata ? Bibdata : BibcollectionNew
+        klass = bibdata ? BibdataNew : BibcollectionNew
         klass.from_xml(bibdata || item)
       end
 
@@ -47,10 +46,10 @@ module Relaton
     end
 
     def new_bib_item_class(options)
-      if options["items"]
+      if options.is_a?(Hash) && options["items"]
         ::Relaton::BibcollectionNew.new(options)
       else
-        ::RelatonBib::BibliographicItem.new(options)
+        ::Relaton::BibdataNew.new(options)
       end
     end
 

data/lib/relaton/bibdatanew.rb

@@ -0,0 +1,62 @@
+require "date"
+
+module Relaton
+  class BibdataNew
+    def initialize(bibitem)
+      @bibitem = bibitem
+    end
+
+    def method_missing(method, *args)
+      %r{(?<m>\w+)=$} =~ method
+      return unless m && %w[xml pdf doc html rxl txt].include?(m)
+
+      uri = @bibitem.link.detect { |u| u.type == method }
+      if uri
+        uri.content = args[0]
+      else
+        @bibitem.link << RelatonBib::TypedUri.new(type: m, content: args[0])
+      end
+    end
+
+    def docidentifier
+      @bibitem.docidentifier.first&.id
+    end
+
+    # From http://gavinmiller.io/2016/creating-a-secure-sanitization-function/
+    # FILENAME_BAD_CHARS = [ '/', '\\', '?', '%', '*', ':', '|', '"', '<', '>', '.', ' ' ]
+
+    # def docidentifier_code
+    #   return "" if docidentifier.nil?
+    #   a = FILENAME_BAD_CHARS.inject(docidentifier.downcase) do |result, bad_char|
+    #     result.gsub(bad_char, '-')
+    #   end
+    # end
+
+    # DOC_NUMBER_REGEX = /([\w\/]+)\s+(\d+):?(\d*)/
+    # def doc_number
+    #   docidentifier&.match(DOC_NUMBER_REGEX) ? $2.to_i : 999999
+    # end
+
+    def self.from_xml(source)
+      new(Relaton::Cli.parse_xml(source))
+    end
+
+    def to_xml(opts = {})
+      options = { bibdata: true, date_format: :full }.merge opts.select { |k,v| k.is_a? Symbol }
+      @bibitem.to_xml nil, **options
+
+      # #datetype = stage&.casecmp("published") == 0 ? "published" : "circulated"
+
+      # ret = ref ? "<bibitem id= '#{ref}' type='#{doctype}'>\n" : "<bibdata type='#{doctype}'>\n"
+      # ret += "<fetched>#{Date.today.to_s}</fetched>\n"
+    end
+
+    def to_h
+      @bibitem.to_hash
+    end
+
+    def to_yaml
+      to_h.to_yaml
+    end
+  end
+end

data/lib/relaton/cli.rb

@@ -19,5 +19,24 @@ module Relaton
     def self.relaton
       @relaton ||= Relaton::Db.new("#{Dir.home}/.relaton/cache", nil)
     end
+
+    # @param content [Nokogiri::XML::Document]
+    # @return [RelatonBib::BibliographicItem, RelatonIsoBib::IsoBibliongraphicItem]
+    def self.parse_xml(doc)
+      if (processor = Relaton::Registry.instance.by_type(Relaton::Cli.doctype(doc)))
+        processor.from_xml(doc.to_s)
+      else
+        RelatonBib::XMLParser.from_xml(doc.to_s)
+      end
+    end
+
+    # @param content [Nokogiri::XML::Document] Document
+    # @return [String] Type prefix
+    def self.doctype(doc)
+      docid = doc.at "docidentifier"
+      return docid[:type] if docid && docid[:type]
+
+      docid&.text&.match(/^\w+/)&.to_s
+    end
   end
 end

data/lib/relaton/cli/base_convertor.rb

@@ -1,5 +1,6 @@
 require "fileutils"
 require "relaton/bibdata"
+require "relaton/bibdatanew"
 require "relaton/bibcollection"
 require "relaton/bibcollectionnew"
 require "relaton/cli/xml_to_html_renderer"
@@ -107,9 +108,9 @@ module Relaton
       def extract_docid(item)
         @default_filelabel += 1
         item.docidentifier.nil? and return @default_filelabel.to_s
-        item.docidentifier.is_a?(Array) or return @default_filelabel.to_s
+        # item.docidentifier.is_a?(Array) or return @default_filelabel.to_s
         item.docidentifier.empty? and return @default_filelabel.to_s
-        docidentifier_code(item.docidentifier[0].id)
+        docidentifier_code(item.docidentifier)
       end
 
       # From http://gavinmiller.io/2016/creating-a-secure-sanitization-function/

data/lib/relaton/cli/command.rb

@@ -28,6 +28,7 @@ module Relaton
       desc "concatenate SOURCE-DIR COLLECTION-FILE", "Concatenate entries in DIRECTORY (containing Relaton-XML or YAML) into a Relaton Collection"
       option :title, aliases: :t,  desc: "Title of resulting Relaton collection"
       option :organization, aliases: :g, desc: "Organization owner of Relaton collection"
+      option :new, aliases: :n, type: :boolean, desc: "Use the new Relaton YAML format"
 
       def concatenate(source_dir, outfile)
         Relaton::Cli::RelatonFile.concatenate(source_dir, outfile, options)
@@ -35,6 +36,7 @@ module Relaton
 
       desc "split Relaton-Collection-File Relaton-XML-Directory", "Split a Relaton Collection into multiple files"
       option :extension, aliases: :x, desc: "File extension of Relaton XML files, defaults to 'rxl'"
+      option :new, aliases: :n, type: :boolean, desc: "Use the new Relaton YAML format"
 
       def split(source, outdir)
         Relaton::Cli::RelatonFile.split(source, outdir, options)

data/lib/relaton/cli/relaton_file.rb

@@ -16,7 +16,7 @@ module Relaton
       end
 
       def concatenate
-        write_to_file(bibcollection.to_xml)
+        write_to_file(bibcollection.to_xml(options))
       end
 
       def split
@@ -81,7 +81,7 @@ module Relaton
       attr_reader :source, :options, :outdir, :outfile
 
       def bibcollection
-        ::Relaton::Bibcollection.new(
+        bib_klass.new(
           title: options[:title],
           items: concatenate_files,
           doctype: options[:doctype],
@@ -103,8 +103,7 @@ module Relaton
       end
 
       def relaton_collection
-        @relaton_collection ||=
-          Relaton::Bibcollection.from_xml(nokogiri_document(nil, source))
+        @relaton_collection ||= bib_klass.from_xml(nokogiri_document(nil, source))
       end
 
       def extract_and_write_to_files
@@ -172,16 +171,30 @@ module Relaton
 
       def bibdata_instance(document, file)
         document = clean_nokogiri_document(document)
-        bibdata = Relaton::Bibdata.from_xml(document.root)
+        bibdata = if options[:new]
+                    Relaton::BibdataNew.from_xml document.root
+                  else
+                    Relaton::Bibdata.from_xml(document.root)
+                  end
         build_bibdata_relaton(bibdata, file)
 
         bibdata
       end
 
+      # @param content [Nokogiri::XML::Document]
+      # @return [Hash]
+      def parse_doc(doc)
+        if (processor = Relaton::Registry.instance.by_type(doctype(doc)))
+          processor.from_xml(doc.to_s).to_hash
+        else
+          RelatonBib::XMLParser.from_xml(doc.to_s).to_hash
+        end
+      end
+
       def build_bibdata_relaton(bibdata, file)
         ["xml", "pdf", "doc", "html", "rxl", "txt"].each do |type|
           file = Pathname.new(file).sub_ext(".#{type}")
-          bibdata.send("#{type}=", file) if File.file?(file)
+          bibdata.send("#{type}=", file.to_s) if File.file?(file)
         end
       end
 
@@ -203,8 +216,9 @@ module Relaton
       end
 
       def convert_yamls_to_xml
+        klass = options[:new] ? YAMLConvertorNew : YAMLConvertor
         select_files_with("yaml").map do |file|
-          { file: file, content: YAMLConvertor.to_xml(file, write: false) }
+          { file: file, content: klass.to_xml(file, write: false) }
         end
       end
 
@@ -233,7 +247,7 @@ module Relaton
       end
 
       def build_filename(file, identifier = nil, ext = "rxl")
-        identifier ||= Pathname.new(File.basename(file, ".xml")).to_s
+        identifier ||= Pathname.new(File.basename(file.to_s, ".xml")).to_s
         [sanitize_string(identifier), options[:extension] || ext].join(".")
       end
 
@@ -246,6 +260,10 @@ module Relaton
         bad_chars = ["/", "\\", "?", "%", "*", ":", "|", '"', "<", ">", ".", " "]
         bad_chars.inject(string.downcase) { |res, char| res.gsub(char, "-") }
       end
+
+      def bib_klass
+        @bib_klass ||= options[:new] ? Relaton::BibcollectionNew : Relaton::Bibcollection
+      end
     end
   end
 end

data/lib/relaton/cli/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Cli
-    VERSION = "0.3.6".freeze
+    VERSION = "0.3.7".freeze
   end
 end

data/lib/relaton/cli/xml_convertor_new.rb

@@ -34,7 +34,7 @@ module Relaton
       def convert_content(content)
         if content.root.name == "bibdata"
           # Bibdata.from_xml(content.to_s)
-          convert_bibdata content
+          Relaton::Cli.parse_xml(content).to_hash
         else
           # Bibcollection.from_xml(content)
           title = content.at("relaton-collection/title").text
@@ -42,32 +42,13 @@ module Relaton
           collection = { "root" => { "title" => title, "author" => author } }
 
           collection["root"]["items"] = content.xpath("//bibdata").map do |bib|
-            convert_bibdata bib
+            Relaton::Cli.parse_xml(bib).to_hash
           end
 
           collection
         end
       end
 
-      # @param content [Nokogiri::XML::Document]
-      # @return [Hash]
-      def convert_bibdata(doc)
-        if (processor = Relaton::Registry.instance.by_type(doctype(doc)))
-          processor.from_xml(doc.to_s).to_hash
-        else
-          RelatonBib::XMLParser.from_xml(doc.to_s).to_hash
-        end
-      end
-
-      # @param content [Nokogiri::XML::Document]
-      # @return [String]
-      def doctype(doc)
-        docid = doc.at "//docidentifier"
-        return docid[:type] if docid && docid[:type]
-
-        docid.text.match(/^\w+/).to_s
-      end
-
       def file_content
         Nokogiri::XML(File.read(file, encoding: "utf-8")).remove_namespaces!
       end

data/lib/relaton/cli/yaml_convertor_new.rb

@@ -9,7 +9,7 @@ module Relaton
         if writable
           convert_and_write(file_content, :to_xml)
         else
-          convert_content(file_content).to_xml(nil, date_format: :full, bibdata: true)
+          convert_content(file_content).to_xml(date_format: :full, bibdata: true)
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2019-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -222,6 +222,7 @@ files:
 - lib/relaton/bibcollection.rb
 - lib/relaton/bibcollectionnew.rb
 - lib/relaton/bibdata.rb
+- lib/relaton/bibdatanew.rb
 - lib/relaton/cli.rb
 - lib/relaton/cli/_document.liquid
 - lib/relaton/cli/_index.liquid