relaton-cli 1.20.5 → 2.0.0.pre.alpha.1

data/lib/relaton/bibdata.rb

@@ -13,7 +13,7 @@ module Relaton
     end
 
     def docidentifier
-      @bibitem.docidentifier.first&.id
+      @bibitem.docidentifier.first&.content&.to_s
     end
 
     # def doctype
@@ -50,10 +50,9 @@ module Relaton
     end
 
     def to_h
-      URL_TYPES.reduce(@bibitem.to_hash) do |h, t|
+      URL_TYPES.each_with_object(YAML.safe_load(@bibitem.to_yaml)) do |t, h|
         value = send t
-        h[t.to_s] = value
-        h
+        h[t.to_s] = value if value
       end
     end
 
@@ -68,19 +67,20 @@ module Relaton
       if @bibitem.respond_to?(meth)
         @bibitem.send meth, *args
       elsif URL_TYPES.include? meth
-        link = @bibitem.link.detect do |l|
+        source = (@bibitem.source || []).detect do |l|
           l.type == meth.to_s || (meth == :uri && l.type.nil?)
         end
-        link&.content&.to_s
+        source&.content&.to_s
       elsif URL_TYPES.include? meth.match(/^\w+(?==)/).to_s.to_sym
         /^(?<type>\w+)/ =~ meth
-        link = @bibitem.link.detect do |l|
+        @bibitem.source ||= []
+        source = @bibitem.source.detect do |l|
           l.type == type || (type == "uri" && l.type.nil?)
         end
-        if link
-          link.content = args[0]
+        if source
+          source.content = args[0]
         else
-          @bibitem.link << RelatonBib::TypedUri.new(type: type, content: args[0])
+          @bibitem.source << Relaton::Bib::Uri.new(type: type, content: args[0])
         end
       else
         super

data/lib/relaton/cli/command.rb

@@ -1,3 +1,4 @@
+require "date"
 require "relaton/cli/relaton_file"
 require "relaton/cli/xml_convertor"
 require "relaton/cli/yaml_convertor"
@@ -31,6 +32,12 @@ module Relaton
       option :retries, aliases: :r, type: :numeric,
                        desc: "Number of network retries. Default 1."
       option :"no-cache", type: :boolean, desc: "Ignore cache"
+      option :"publication-date-before",
+        desc: "Fetch only documents published before the specified date " \
+          "(e.g. 2008, 2008-02, or 2008-02-02)"
+      option :"publication-date-after",
+        desc: "Fetch only documents published after the specified date " \
+          "(e.g. 2002, 2002-01, or 2002-01-01)"
 
       def fetch(code)
         io = IO.new($stdout.fcntl(::Fcntl::F_DUPFD), mode: "w:UTF-8")
@@ -133,7 +140,7 @@ module Relaton
         xml = Nokogiri::XML(File.read(file, encoding: "UTF-8"))
         item = Relaton::Cli.parse_xml xml
         result = if /yaml|yml/.match?(options[:format])
-                   item.to_hash.to_yaml
+                   item.to_yaml
                  else item.send "to_#{options[:format]}"
                  end
         ext = case options[:format]
@@ -174,6 +181,30 @@ module Relaton
 
     private
 
+    DATE_FILTER_FORMAT = /\A\d{4}(-\d{2}(-\d{2})?)?\z/
+
+    def parse_date_option(value, name)
+      return unless value
+
+      unless value.match?(DATE_FILTER_FORMAT)
+        raise ArgumentError,
+          "Invalid #{name}: #{value.inspect}. Expected YYYY, YYYY-MM, or YYYY-MM-DD."
+      end
+      parts = value.split("-").map(&:to_i)
+      Date.new(*parts.concat([1] * (3 - parts.size)))
+    rescue Date::Error
+      raise ArgumentError,
+        "Invalid #{name}: #{value.inspect}. Date components are out of range."
+    end
+
+    def validate_date_range(date_after, date_before)
+      return unless date_after && date_before
+      return if date_after < date_before
+
+      raise ArgumentError,
+        "Invalid date range: --publication-date-after (#{date_after}) must be before --publication-date-before (#{date_before})."
+    end
+
     # @param code [String]
     # @param options [Hash]
     # @option options [String] :type
@@ -183,6 +214,10 @@ module Relaton
     def fetch_document(code, options) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/AbcSize,Metrics/MethodLength
       year = options[:year]&.to_s
       dup_opts = options.dup.transform_keys { |k| k.to_s.gsub("-", "_").to_sym }
+      %i[publication_date_before publication_date_after].each do |key|
+        dup_opts[key] = parse_date_option(dup_opts[key], key.to_s.tr("_", "-").prepend("--")) if dup_opts[key]
+      end
+      validate_date_range dup_opts[:publication_date_after], dup_opts[:publication_date_before]
       if (processor = Relaton::Registry.instance.by_type options[:type]&.upcase)
         doc = Relaton.db.fetch_std code, year, processor.short, **dup_opts
       elsif options[:type] then return
@@ -191,16 +226,16 @@ module Relaton
       return "No matching bibliographic entry found" unless doc
 
       serialize doc, options[:format]
-    rescue RelatonBib::RequestError => e
+    rescue Relaton::RequestError => e
       e.message
     end
 
-    # @param doc [RelatonBib::BibliographicItem]
+    # @param doc [Relaton::Bib::ItemData]
     # @param format [String]
     # @return [String]
     def serialize(doc, format)
       case format
-      when "yaml", "yml" then doc.to_hash.to_yaml
+      when "yaml", "yml" then doc.to_yaml
       when "bibtex" then doc.to_bibtex
       else doc.to_xml bibdata: true
       end

data/lib/relaton/cli/relaton_file.rb

@@ -119,15 +119,15 @@ module Relaton
           if (bib = xml.at("//bibdata"))
             bib = nokogiri_document(bib.to_xml)
           elsif (rfc = xml.at("//rfc"))
-            require "relaton_ietf/bibxml_parser"
-            ietf = RelatonIetf::BibXMLParser.fetch_rfc rfc
+            require "relaton/ietf"
+            require "relaton/ietf/bibxml_parser"
+            ietf = Relaton::Ietf::BibXMLParser.parse_rfc rfc.to_xml
             bib = nokogiri_document(ietf.to_xml(bibdata: true))
           else
             next
           end
 
           bib.remove_namespaces!
-          bib.root.add_namespace(nil, "xmlns")
 
           bibdata = Relaton::Bibdata.from_xml(bib.root)
           if bibdata
@@ -147,8 +147,9 @@ module Relaton
         xml_files.flatten.reduce([]) do |mem, xml|
           doc = nokogiri_document(xml[:content])
           if (rfc = doc.at("/rfc"))
-            require "relaton_ietf/bibxml_parser"
-            ietf = RelatonIetf::BibXMLParser.fetch_rfc rfc
+            require "relaton/ietf"
+            require "relaton/ietf/bibxml_parser"
+            ietf = Relaton::Ietf::BibXMLParser.parse_rfc rfc.to_xml
             d = nokogiri_document ietf.to_xml(bibdata: true)
             mem << bibdata_instance(d, xml[:file])
           elsif %w[bibitem bibdata].include? doc&.root&.name
@@ -231,7 +232,6 @@ module Relaton
       # @return [Nokogiri::XML::Document]
       def clean_nokogiri_document(document)
         document.remove_namespaces!
-        document.root.add_namespace(nil, "xmlns")
         nokogiri_document(document.to_xml)
       end
 

data/lib/relaton/cli/subcommand_collection.rb

@@ -102,13 +102,27 @@ module Relaton
                     desc: "Type of standard to get bibliographic entry for"
       option :year, aliases: :y, type: :numeric,
                     desc: "Year the standard was published"
+      option :"publication-date-before",
+        desc: "Fetch only documents published before the specified date " \
+          "(e.g. 2008, 2008-02, or 2008-02-02)"
+      option :"publication-date-after",
+        desc: "Fetch only documents published after the specified date " \
+          "(e.g. 2002, 2002-01, or 2002-01-01)"
       option :collection, aliases: :c, required: true,
                           desc: "Collection to store a document"
       option :dir, aliases: :d, desc: "Directory with collections. Default is " \
                                       "$HOME/.relaton/collections."
 
       def fetch(code) # rubocop:disable Metrics/AbcSize
-        doc = Relaton.db.fetch(code, options[:year]&.to_s)
+        opts = {}
+        if options[:"publication-date-before"]
+          opts[:publication_date_before] = parse_date_option(options[:"publication-date-before"], "--publication-date-before")
+        end
+        if options[:"publication-date-after"]
+          opts[:publication_date_after] = parse_date_option(options[:"publication-date-after"], "--publication-date-after")
+        end
+        validate_date_range opts[:publication_date_after], opts[:publication_date_before]
+        doc = Relaton.db.fetch(code, options[:year]&.to_s, **opts)
         if doc
           colfile = File.join directory, options[:collection]
           coll = read_collection colfile
@@ -130,11 +144,13 @@ module Relaton
         collfile = File.join directory, options[:collection]
         coll = read_collection collfile
         xml = Nokogiri::XML File.read(file, encoding: "UTF-8")
+        xml.remove_namespaces!
         if xml.at "relaton-collection"
+          imported = import_collection(xml)
           if coll
-            coll << Relaton::Bibcollection.from_xml(xml)
+            coll << imported
           else
-            coll = Relaton::Bibcollection.from_xml(xml)
+            coll = imported
           end
         else
           coll ||= Relaton::Bibcollection.new({})
@@ -155,6 +171,22 @@ module Relaton
 
       private
 
+      # Parse a namespace-free collection XML document.
+      # Bibcollection.from_xml expects namespaced docs (via apply_namespace),
+      # so we use plain XPath on the namespace-stripped document instead.
+      def import_collection(xml)
+        title = xml.at("relaton-collection/title")&.text
+        author = xml.at_xpath(
+          "./relaton-collection/contributor[role/@type='author']"\
+          "/organization/name",
+        )&.text
+        items = xml.xpath("relaton-collection/relation").map do |rel|
+          el = rel.at("bibdata") || rel.at("bibitem")
+          Relaton::Bibdata.from_xml(el || rel)
+        end.compact
+        Relaton::Bibcollection.new(title: title, author: author, items: items)
+      end
+
       # @return [String]
       def directory
         options.fetch :dir, File.join(Dir.home, ".relaton/collections")
@@ -217,9 +249,9 @@ module Relaton
       # @param item [Relaton::Bibdata]
       def puts_human_readable_item(item) # rubocop:disable Metrics/AbcSize
         puts "Document identifier: #{item.docidentifier}"
-        puts "Title: #{item.title.first.title.content}"
+        puts "Title: #{item.title.first.content}"
         puts "Status: #{item.status.stage}"
-        item.date.each { |d| puts "Date #{d.type}: #{d.on || d.from}" }
+        item.date.each { |d| puts "Date #{d.type}: #{d.at || d.from}" }
       end
     end
   end

data/lib/relaton/cli/subcommand_db.rb

@@ -40,6 +40,12 @@ module Relaton
                                          "Default xml."
       option :year, aliases: :y, type: :numeric, desc: "Year the standard " \
                                                        "was published"
+      option :"publication-date-before",
+        desc: "Fetch only documents published before the specified date " \
+          "(e.g. 2008, 2008-02, or 2008-02-02)"
+      option :"publication-date-after",
+        desc: "Fetch only documents published after the specified date " \
+         "(e.g. 2002, 2002-01, or 2002-01-01)"
 
       def fetch(code)
         io = IO.new($stdout.fcntl(::Fcntl::F_DUPFD), mode: "w:UTF-8")

data/lib/relaton/cli/util.rb

@@ -1,7 +1,7 @@
 module Relaton
   module Cli
     module Util
-      extend RelatonBib::Util
+      extend Relaton::Bib::Util
       PROGNAME = "relaton-cli".freeze
     end
   end

data/lib/relaton/cli/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Cli
-    VERSION = "1.20.5".freeze
+    VERSION = "2.0.0-alpha.1".freeze
   end
 end

data/lib/relaton/cli/xml_to_html_renderer.rb

@@ -90,12 +90,13 @@ module Relaton::Cli
           elsif value.is_a?(Hash) then v = value["content"]
           else v = value
           end
-        when "docid"
-          v = if value.is_a?(Array)
-                value.detect { |did| did["id"] !~ /^(http|https):\/\// } ||
-                  value.first
-              else value
-              end
+        when "docidentifier"
+          did = if value.is_a?(Array)
+                  value.detect { |d| (d["id"] || d["content"]).to_s !~ /^(http|https):\/\// } ||
+                    value.first
+                else value
+                end
+          v = did
         else v = value
         end
         [key.to_s, empty2nil(v)]

data/lib/relaton/cli/yaml_convertor.rb

@@ -1,6 +1,6 @@
 require "yaml"
 require "relaton/cli/base_convertor"
-require "relaton_bib"
+require "relaton/bib"
 
 module Relaton
   module Cli
@@ -33,13 +33,15 @@ module Relaton
         # @return [RelatonBib::BibliographicItem,
         #   RelatonIso::IsoBiblioraphicItem]
         def convert_single_file(content)
-          flavor = content.dig("ext", "flavor") || doctype(content["docid"])
+          flavor = content.dig("ext", "flavor") || doctype(content["docidentifier"])
           if (processor = Registry.instance.by_type(flavor))
-            processor.hash_to_bib content
+            begin
+              processor.from_yaml content.to_yaml
+            rescue RuntimeError
+              Relaton::Bib::Item.from_yaml(content.to_yaml)
+            end
           else
-            RelatonBib::BibliographicItem.new(
-              **RelatonBib::HashConverter::hash_to_bib(content)
-            )
+            Relaton::Bib::Item.from_yaml(content.to_yaml)
           end
         end
 
@@ -51,7 +53,7 @@ module Relaton
           did = docid.is_a?(Array) ? docid.fetch(0) : docid
           return unless did
 
-          did["type"] || did.fetch("id")&.match(/^\w+/)&.to_s
+          did["type"] || did.fetch("content")&.match(/^\w+/)&.to_s
         end
       end
 

data/lib/relaton/cli.rb

@@ -1,3 +1,4 @@
+require "fileutils"
 require "thor"
 require "thor/hollaback"
 require_relative "cli/version"
@@ -19,6 +20,7 @@ module Relaton
       # @return [Relaton::Db]
       def db(dir)
         if dir
+          FileUtils.mkdir_p File.dirname(DBCONF)
           File.write DBCONF, dir, encoding: "UTF-8"
           @db = Relaton::Db.new dir, nil
         else
@@ -39,19 +41,14 @@ module Relaton
 
     class << self
       def version
-        require "relaton_bib"
-        require "relaton_iso_bib"
+        require "relaton/bib"
         registry = Relaton::Registry.instance
         puts "CLI => #{Relaton::Cli::VERSION}"
-        puts "relaton => #{Relaton::VERSION}"
-        puts "relaton-bib => #{RelatonBib::VERSION}"
-        puts "relaton-iso-bib => #{RelatonIsoBib::VERSION}"
+        puts "relaton => #{Gem.loaded_specs['relaton'].version}"
+        puts "relaton-bib => #{Gem.loaded_specs['relaton-bib'].version}"
         registry.processors.each_key do |k|
-          require k.to_s
-          klass = registry.send(:camel_case, k.to_s)
-          klass = "#{klass}::VERSION"
-          version = Kernel.const_get(klass)
-          puts "#{k.to_s.sub('_', '-')} => #{version}"
+          name = k.to_s.sub("_", "-")
+          puts "#{name} => #{Gem.loaded_specs[name].version}"
         end
       end
 
@@ -76,10 +73,11 @@ module Relaton
       # @return [RelatonBib::BibliographicItem,
       #   RelatonIsoBib::IsoBibliongraphicItem]
       def parse_xml(doc)
+        doc.remove_namespaces! if doc.respond_to?(:remove_namespaces!)
         if (proc = Cli.processor(doc))
           proc.from_xml(doc.to_s)
         else
-          RelatonBib::XMLParser.from_xml(doc.to_s)
+          Relaton::Bib::Item.from_xml(doc.to_s) rescue nil
         end
       end
 

data/relaton-cli.gemspec

@@ -20,10 +20,10 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 3.0.0"
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
 
   spec.add_runtime_dependency "liquid", "~> 5"
-  spec.add_runtime_dependency "relaton", "~> 1.20.0"
+  spec.add_runtime_dependency "relaton", "~> 2.0.0-alpha.1"
   spec.add_runtime_dependency "thor"
   spec.add_runtime_dependency "thor-hollaback"
 

data/templates/_document.liquid

@@ -20,16 +20,16 @@
     <div class="doc-identifier">
       <h{{ depth }}>
       {% if default_link %}
-        <a href="{{ default_link }}">{{ document.docid.id }}</a>
+        <a href="{{ default_link }}">{{ document.docidentifier.content }}</a>
       {% else %}
-        {{ document.docid.id }}
+        {{ document.docidentifier.content }}
       {% endif %}
       </h{{ depth }}>
     </div>
 
     <div class="doc-type-wrap">
-      <div class="doc-type {{ document.doctype.type | downcase | split: " " | join: "-" }}">
-      {{ document.doctype.type }}
+      <div class="doc-type {{ document.ext.doctype.content | downcase | split: " " | join: "-" }}">
+      {{ document.ext.doctype.content }}
       </div>
     </div>
 
@@ -50,18 +50,17 @@
     </h{{ depth | plus: 1 }}>
   </div>
 
-  {% if document.docstatus %}
-  <div class="doc-info {{ document.docstatus.stage.value | downcase }}">
-    <div class="doc-stage {{ document.docstatus.stage.value | downcase }}">
-      {{ document.docstatus.stage.abbreviation }}
-      {% if document.docstatus.substage %}
-        {{ document.docstatus.stage.value }}.{{ document.docstatus.substage.value }}
+  {% if document.status %}
+  <div class="doc-info {{ document.status.stage.content | downcase }}">
+    <div class="doc-stage {{ document.status.stage.content | downcase }}">
+      {% if document.status.substage %}
+        {{ document.status.stage.content }}.{{ document.status.substage.content }}
       {% else %}
-        {{ document.docstatus.stage.value }}
+        {{ document.status.stage.content }}
       {% endif %}
     </div>
     <div class="doc-dates">
-      {% unless document.docstatus.stage.value == "published" %}
+      {% unless document.status.stage.content == "published" %}
       <div class="doc-updated">
       {% else %}
       <div class="doc-published">

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cli
 version: !ruby/object:Gem::Version
-  version: 1.20.5
+  version: 2.0.0.pre.alpha.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -30,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 2.0.0.pre.alpha.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 2.0.0.pre.alpha.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -87,8 +86,8 @@ executables:
 - relaton
 extensions: []
 extra_rdoc_files:
-- docs/README.adoc
 - LICENSE
+- docs/README.adoc
 files:
 - ".github/workflows/rake.yml"
 - ".github/workflows/release.yml"
@@ -97,6 +96,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.md
+- CLAUDE.md
 - Gemfile
 - LICENSE
 - Rakefile
@@ -131,7 +131,6 @@ homepage: https://github.com/metanorma/relaton-cli
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -139,15 +138,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Relaton Command-line Interface
 test_files: []