relaton-cli 0.5.0 → 0.6.0

data/lib/relaton/cli/base_convertor.rb

@@ -1,8 +1,6 @@
 require "fileutils"
 require "relaton/bibdata"
-require "relaton/bibdatanew"
 require "relaton/bibcollection"
-require "relaton/bibcollectionnew"
 require "relaton/cli/xml_to_html_renderer"
 
 module Relaton
@@ -47,10 +45,6 @@ module Relaton
 
       attr_reader :file, :outdir, :options, :writable, :overwrite
 
-      def default_ext
-        raise "Override this method"
-      end
-
       def convert_to_html
         Relaton::Cli::XmlToHtmlRenderer.render(
           xml_content(file),
@@ -59,9 +53,9 @@ module Relaton
         )
       end
 
-      def xml_content(file)
-        File.read(file, encoding: "utf-8")
-      end
+      # def xml_content(file)
+      #   File.read(file, encoding: "utf-8")
+      # end
 
       def install_dependencies(dependencies)
         dependencies.each { |dependency| require(dependency) }
@@ -84,19 +78,21 @@ module Relaton
         outfile ||= Pathname.new(file).sub_ext(extension).to_s
 
         if !File.exists?(outfile) || overwrite
-          File.open(outfile, "w:utf-8") { |file| file.write(content) }
+          File.open(outfile, "w:utf-8") do |file|
+            file.write(content)
+          end
         end
       end
 
       def write_to_file_collection(content, format)
+        # if outdir && (content.is_a?(Relaton::Bibcollection))
+        #   FileUtils.mkdir_p(outdir)
+        #   content.items_flattened.each do |item|
+        #     collection = collection_filename(item.docidentifier_code)
+        #     write_to_a_file(item_output(item, format), collection)
+        #   end
+        # end
         if outdir && (content.is_a?(Relaton::Bibcollection))
-          FileUtils.mkdir_p(outdir)
-          content.items_flattened.each do |item|
-            collection = collection_filename(item.docidentifier_code)
-            write_to_a_file(item_output(item, format), collection)
-          end
-        end
-        if outdir && (content.is_a?(Relaton::BibcollectionNew))
           FileUtils.mkdir_p(outdir)
           content.items_flattened.each do |item|
             collection = collection_filename(extract_docid(item))

data/lib/relaton/cli/command.rb

@@ -1,8 +1,6 @@
 require "relaton/cli/relaton_file"
 require "relaton/cli/xml_convertor"
-require "relaton/cli/xml_convertor_new"
 require "relaton/cli/yaml_convertor"
-require "relaton/cli/yaml_convertor_new"
 require "fcntl"
 
 module Relaton
@@ -13,7 +11,7 @@ module Relaton
       option :year, aliases: :y, type: :numeric, desc: "Year the standard was published"
 
       def fetch(code)
-        Relaton::Cli.relaton
+        Relaton.db
         io = IO.new(STDOUT.fcntl(::Fcntl::F_DUPFD), mode: 'w:UTF-8')
         io.puts(fetch_document(code, options) || supported_type_message)
       end
@@ -54,18 +52,7 @@ module Relaton
         Relaton::Cli::YAMLConvertor.to_xml(filename, options)
       end
 
-      desc "yaml2xmlnew YAML", "Convert Relaton YAML into Relaton Collection XML or separate files"
-      option :extension, aliases: :x, default: "rxl", desc: "File extension of Relaton XML files, defaults to 'rxl'"
-      option :prefix, aliases: :p, desc: "Filename prefix of individual Relaton XML files, defaults to empty"
-      option :outdir, aliases: :o,  desc: "Output to the specified directory with individual Relaton Bibdata XML files"
-      option :require, aliases: :r, type: :array, desc: "Require LIBRARY prior to execution"
-      option :overwrite, aliases: :f, type: :boolean, default: false, desc: "Overwrite the existing file"
-
-      def yaml2xmlnew(filename)
-        Relaton::Cli::YAMLConvertorNew.to_xml(filename, options)
-      end
-
-      desc "xml2yaml XML", "Convert Relaton XML into Relaton Bibdata / Bibcollection YAML (and separate files)"
+      desc "xml2yamlnew XML", "Convert Relaton XML into Relaton Bibdata / Bibcollection YAML (and separate files)"
       option :extension, aliases: :x, default: "yaml", desc: "File extension of Relaton YAML files, defaults to 'yaml'"
       option :prefix, aliases: :p, desc: "Filename prefix of Relaton XML files, defaults to empty"
       option :outdir, aliases: :o, desc: "Output to the specified directory with individual Relaton Bibdata YAML files"
@@ -76,17 +63,6 @@ module Relaton
         Relaton::Cli::XMLConvertor.to_yaml(filename, options)
       end
 
-      desc "xml2yamlnew XML", "Convert Relaton XML into Relaton Bibdata / Bibcollection YAML (and separate files)"
-      option :extension, aliases: :x, default: "yaml", desc: "File extension of Relaton YAML files, defaults to 'yaml'"
-      option :prefix, aliases: :p, desc: "Filename prefix of Relaton XML files, defaults to empty"
-      option :outdir, aliases: :o, desc: "Output to the specified directory with individual Relaton Bibdata YAML files"
-      option :require, aliases: :r, type: :array, desc: "Require LIBRARY prior to execution"
-      option :overwrite, aliases: :f, type: :boolean, default: false, desc: "Overwrite the existing file"
-
-      def xml2yamlnew(filename)
-        Relaton::Cli::XMLConvertorNew.to_yaml(filename, options)
-      end
-
       desc "xml2html RELATON-INDEX-XML", "Convert Relaton Collection XML into HTML"
       option :stylesheet, aliases: :s, desc: "Stylesheet file path for rendering HTML index"
       option :templatedir, aliases: :t, desc: "Liquid template directory for rendering Relaton items and collection"
@@ -96,22 +72,22 @@ module Relaton
         Relaton::Cli::XMLConvertor.to_html(file, style, template)
       end
 
-      desc "yaml2html RELATON-INDEX-YAML", "Concatenate Relaton Collection YAML into HTML"
-      option :stylesheet, aliases: :s, desc: "Stylesheet file path for rendering HTML index"
-      option :templatedir, aliases: :t, desc: "Liquid template directory for rendering Relaton items and collection"
-      option :overwrite, aliases: :f, type: :boolean, default: false, desc: "Overwrite the existing file"
+      # desc "yaml2html RELATON-INDEX-YAML", "Concatenate Relaton Collection YAML into HTML"
+      # option :stylesheet, aliases: :s, desc: "Stylesheet file path for rendering HTML index"
+      # option :templatedir, aliases: :t, desc: "Liquid template directory for rendering Relaton items and collection"
+      # option :overwrite, aliases: :f, type: :boolean, default: false, desc: "Overwrite the existing file"
 
-      def yaml2html(file, style = nil, template = nil)
-        Relaton::Cli::YAMLConvertor.to_html(file, style, template)
-      end
+      # def yaml2html(file, style = nil, template = nil)
+      #   Relaton::Cli::YAMLConvertor.to_html(file, style, template)
+      # end
 
       desc "yaml2htmlnew RELATON-INDEX-YAML", "Concatenate Relaton Collection YAML into HTML"
       option :stylesheet, aliases: :s, desc: "Stylesheet file path for rendering HTML index"
       option :templatedir, aliases: :t, desc: "Liquid template directory for rendering Relaton items and collection"
       option :overwrite, aliases: :f, type: :boolean, default: false, desc: "Overwrite the existing file"
 
-      def yaml2htmlnew(file, style = nil, template = nil)
-        Relaton::Cli::YAMLConvertorNew.to_html(file, style, template)
+      def yaml2html(file, style = nil, template = nil)
+        Relaton::Cli::YAMLConvertor.to_html(file, style, template)
       end
 
       private

data/lib/relaton/cli/relaton_file.rb

@@ -81,7 +81,7 @@ module Relaton
       attr_reader :source, :options, :outdir, :outfile
 
       def bibcollection
-        bib_klass.new(
+        Bibcollection.new(
           title: options[:title],
           items: concatenate_files,
           doctype: options[:doctype],
@@ -103,7 +103,7 @@ module Relaton
       end
 
       def relaton_collection
-        @relaton_collection ||= bib_klass.from_xml(nokogiri_document(nil, source))
+        @relaton_collection ||= Bibcollection.from_xml(nokogiri_document(nil, source))
       end
 
       def extract_and_write_to_files
@@ -125,7 +125,7 @@ module Relaton
           bib.remove_namespaces!
           bib.root.add_namespace(nil, "xmlns")
 
-          bibdata = Relaton::BibdataNew.from_xml(bib.root)
+          bibdata = Relaton::Bibdata.from_xml(bib.root)
           build_bibdata_relaton(bibdata, file)
 
           write_to_file(bibdata.send(output_type), outdir, build_filename(file))
@@ -175,33 +175,19 @@ module Relaton
         when "yml", "yaml"
           :to_yaml
         else
-          puts "The given extension of '#{ext}' is not supported."
+          puts "[relaton-cli] the given extension of '#{ext}' is not supported."
           :to_xml
         end
       end
 
       def bibdata_instance(document, file)
         document = clean_nokogiri_document(document)
-        bibdata = if options[:new]
-                    Relaton::BibdataNew.from_xml document.root
-                  else
-                    Relaton::Bibdata.from_xml(document.root)
-                  end
+        bibdata = Relaton::Bibdata.from_xml document.root
         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}")
@@ -227,9 +213,8 @@ module Relaton
       end
 
       def convert_yamls_to_xml
-        klass = options[:new] ? YAMLConvertorNew : YAMLConvertor
         select_files_with("yaml").map do |file|
-          { file: file, content: klass.to_xml(file, write: false) }
+          { file: file, content: YAMLConvertor.to_xml(file, write: false) }
         end
       end
 
@@ -271,10 +256,6 @@ 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.5.0".freeze
+    VERSION = "0.6.0".freeze
   end
 end

data/lib/relaton/cli/xml_convertor.rb

@@ -29,11 +29,23 @@ module Relaton
         "yaml"
       end
 
+      # @param content [Nokogiri::XML::Document]
+      # @return [Hash]
       def convert_content(content)
         if content.root.name == "bibdata"
-          Bibdata.from_xml(content.to_s)
+          Bibdata.from_xml(content)
+          # Relaton::Cli.parse_xml(content).to_hash
         else
           Bibcollection.from_xml(content)
+          # title = content.at("relaton-collection/title").text
+          # author = content.at("relaton-collection/contributor/organization/name").text
+          # collection = { "root" => { "title" => title, "author" => author } }
+
+          # collection["root"]["items"] = content.xpath("//bibdata").map do |bib|
+          #   Relaton::Cli.parse_xml(bib).to_hash
+          # end
+
+          # collection
         end
       end
 

data/lib/relaton/cli/xml_to_html_renderer.rb

@@ -13,7 +13,7 @@ module Relaton::Cli
     def render(index_xml)
       Liquid::Template.
         parse(template).
-        render(build_liquid_document(index_xml))
+        render(build_liquid_document(index_xml), { strict_variables: true })
     end
 
     def uri_for_extension(uri, extension)

data/lib/relaton/cli/yaml_convertor.rb

@@ -1,5 +1,6 @@
 require "yaml"
 require "relaton/cli/base_convertor"
+require "relaton_bib"
 
 module Relaton
   module Cli
@@ -8,7 +9,7 @@ module Relaton
         if writable
           convert_and_write(file_content, :to_xml)
         else
-          convert_content(file_content).to_xml
+          convert_content(file_content).to_xml(date_format: :full, bibdata: true)
         end
       end
 
@@ -34,21 +35,46 @@ module Relaton
       end
 
       def file_content
-        YAML.load_file(file)
+        date_to_string(YAML.load_file(file))
+      end
+
+      def date_to_string(obj)
+        obj.is_a? Hash and
+          return obj.inject({}){|memo,(k,v)| memo[k] = date_to_string(v); memo}
+        obj.is_a? Array and
+          return obj.inject([]){|memo,v    | memo      << date_to_string(v); memo}
+        return obj.is_a?(Date) ? obj.to_s : obj
       end
 
       def convert_single_file(content)
-        Relaton::Bibdata.new(content)
+        if (processor = Relaton::Registry.instance.by_type(doctype(content["docid"])))
+          processor.hash_to_bib content
+        else
+          RelatonBib::BibliographicItem.new(RelatonBib::HashConverter::hash_to_bib(content))
+        end
+      end
+
+      # @param content [Hash]
+      # @return [String]
+      def doctype(docid)
+        did = docid.is_a?(Array) ? docid.fetch(0) : docid
+        return did["type"] if did && did["type"]
+
+        did&.fetch("id")&.match(/^\w+/)&.to_s
       end
 
       def convert_collection(content)
         if content.has_key?("root")
+          content["root"]["items"] = content["root"]["items"].map do |i|
+            # RelatonBib::HashConverter::hash_to_bib(i)
+            convert_single_file(i)
+          end
           Relaton::Bibcollection.new(content["root"])
         end
       end
 
       def xml_content(_raw_file)
-        convert_content(file_content).to_xml
+        convert_content(file_content).to_xml(date_format: :full, bibdata: true)
       end
 
       def convert_content(content)

data/lib/relaton/cli.rb

@@ -1,10 +1,21 @@
 require "thor"
 require "relaton"
-require "relaton/xml_document"
 require_relative "cli/command"
 
 module Relaton
+  def self.db
+    Cli.relaton
+  end
+
   module Cli
+    class RelatonDb
+      include Singleton
+
+      def db
+        @db ||= Relaton::Db.new("#{Dir.home}/.relaton/cache", nil)
+      end
+    end
+
     def self.start(arguments)
       Relaton::Cli::Command.start(arguments)
     end
@@ -17,7 +28,7 @@ module Relaton
     # whenever necessary.
     #
     def self.relaton
-      @relaton ||= Relaton::Db.new("#{Dir.home}/.relaton/cache", nil)
+      RelatonDb.instance.db
     end
 
     # @param content [Nokogiri::XML::Document]

data/lib/relaton-cli.rb

@@ -1,5 +1,4 @@
 require_relative "relaton/bibcollection"
-require_relative "relaton/bibcollectionnew"
 require_relative "relaton/bibdata"
 require_relative "relaton/element_finder"
 require_relative "relaton/xml_document"

data/relaton-cli.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "debase"
   spec.add_development_dependency "simplecov"
 
-  spec.add_runtime_dependency "relaton", "~> 0.7.0"
+  spec.add_runtime_dependency "relaton", "~> 0.8.0"
   spec.add_runtime_dependency "thor"
   spec.add_runtime_dependency "liquid"
   # spec.add_runtime_dependency 'byebug'

data/templates/_document.liquid

@@ -8,9 +8,9 @@
     <div class="doc-identifier">
       <h{{ depth }}>
       {% if document.html == "" %}
-        {{ document.docidentifier }}
+        {{ document.docid.id }}
       {% else %}
-        <a href="{{ document.html }}">{{ document.docidentifier }}</a>
+        <a href="{{ document.html }}">{{ document.docid.id }}</a>
       {% endif %}
       </h{{ depth }}>
     </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-11 00:00:00.000000000 Z
+date: 2020-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -207,6 +207,7 @@ files:
 - ".github/workflows/windows.yml"
 - ".gitignore"
 - ".hound.yml"
+- ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
@@ -220,9 +221,7 @@ files:
 - i18n.yaml
 - lib/relaton-cli.rb
 - 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
@@ -231,12 +230,9 @@ files:
 - lib/relaton/cli/relaton_file.rb
 - lib/relaton/cli/version.rb
 - lib/relaton/cli/xml_convertor.rb
-- lib/relaton/cli/xml_convertor_new.rb
 - lib/relaton/cli/xml_to_html_renderer.rb
 - lib/relaton/cli/yaml_convertor.rb
-- lib/relaton/cli/yaml_convertor_new.rb
 - lib/relaton/element_finder.rb
-- lib/relaton/xml_document.rb
 - relaton-cli.gemspec
 - templates/_document.liquid
 - templates/_index.liquid

data/lib/relaton/bibcollectionnew.rb

@@ -1,116 +0,0 @@
-require "relaton/element_finder"
-
-module Relaton
-  class BibcollectionNew
-    extend Relaton::ElementFinder
-
-    ATTRIBS = %i[
-      title
-      items
-      doctype
-      author
-    ].freeze
-
-    attr_accessor *ATTRIBS
-
-    def initialize(options)
-      self.items = []
-      ATTRIBS.each do |k|
-        value = options[k] || options[k.to_s]
-        send("#{k}=", value)
-      end
-      self.items = (items || []).reduce([]) do |acc, item|
-        acc << if item.is_a?(::Relaton::BibcollectionNew) || item.is_a?(::Relaton::BibdataNew)
-                 item
-               else new_bib_item_class(item)
-               end
-      end
-    end
-
-    # arbitrary number, must sort after all bib items
-    def doc_number
-      9999999
-    end
-
-    def self.from_xml(source)
-      title = find_text("./relaton-collection/title", source)
-      author = find_text("./relaton-collection/contributor[role/@type = 'author']/organization/name", source)
-
-      items = find_xpath("./relaton-collection/relation", source)&.map do |item|
-        bibdata = find("./bibdata", item)
-        klass = bibdata ? BibdataNew : BibcollectionNew
-        klass.from_xml(bibdata || item)
-      end
-
-      new(title: title, author: author, items: items)
-    end
-
-    def new_bib_item_class(options)
-      if options.is_a?(Hash) && options["items"]
-        ::Relaton::BibcollectionNew.new(options)
-      else
-        ::Relaton::BibdataNew.new(options)
-      end
-    end
-
-    def items_flattened
-      items.sort_by! do |b|
-        b.docnumber
-      end
-
-      items.inject([]) do |acc,item|
-        if item.is_a? ::Relaton::BibcollectionNew
-          acc << item.items_flattened
-        else
-          acc << item
-        end
-      end
-    end
-
-    def to_xml(opts)
-      items.sort_by! do |b|
-        b.docnumber
-      end
-
-      collection_type = if doctype
-        "type=\"#{doctype}\""
-      else
-        'xmlns="https://open.ribose.com/relaton-xml"'
-      end
-
-      ret = "<relaton-collection #{collection_type}>"
-      ret += "<title>#{title}</title>" if title
-      if author
-        ret += "<contributor><role type='author'/><organization><name>#{author}</name></organization></contributor>"
-      end
-      unless items.empty?
-        items.each do |item|
-          ret += "<relation type='partOf'>"
-          ret += item.to_xml(opts)
-          ret += "</relation>\n"
-        end
-      end
-      ret += "</relaton-collection>\n"
-    end
-
-    def to_yaml
-      to_h.to_yaml
-    end
-
-    def to_h
-      items.sort_by! do |b|
-        b.doc_number
-      end
-
-      a = ATTRIBS.inject({}) do |acc, k|
-        acc[k.to_s] = send(k)
-        acc
-      end
-
-      a["items"] = a["items"].map(&:to_h)
-
-      { "root" => a }
-    end
-
-  end
-end

data/lib/relaton/bibdatanew.rb

@@ -1,62 +0,0 @@
-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 == m }
-      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