relaton-cli 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46e2d1bdc96570253e252c25e3a19758cea3bc3351152760b5698a37ab6a1959
-  data.tar.gz: 91c22fe6506bce215c37e0aca6b61554fc6b39b857ddda812ece6031b5bfe89d
+  metadata.gz: 7fdcb1820641391e7cddeb35b48d11d0fe0cdbb76712e3295c16bcbb60b3634b
+  data.tar.gz: cad8f85257a2eb9eb59035bd2a7b4515a3d9b0332803c430f90a25cbc85c9554
 SHA512:
-  metadata.gz: 5a90240c3672fed05369cf0c166d666eb012d3adddb9bbf39b04f2ee2d1e3c603f652144324d9aeec0c69fb1f32c564ebe414b34a1b56d9688fd07e72e18e608
-  data.tar.gz: c72e91f93f788e8cb0aae092e03412f6d3510c8647bab62fb4b40d6c1403eb8e1a8127d019587a5b5cfa87701b9d7157d86f0feef91a627cf67b4ccbd58f5d23
+  metadata.gz: 31090e660806cca71e117e4122ed364d86c576fb40feb63eb747385502e2fe4d4a3c128bb148efcf351e6070e7beb8c9947cb586aad3eb28cbaeebbe0c4f91af
+  data.tar.gz: 4114acb8fd5e55c822d192ac181155914e5f4eadb87c73b0f3873a3279aa51c7818d5ed79b551121c6ad75753373b44a2ee5f6f150f272ea2d0909671231e2de

data/.github/workflows/macos.yml

@@ -1,14 +1,19 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: macos
 
-on: [push]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ '**' ]
 
 jobs:
   test-macos:
     name: Test on Ruby ${{ matrix.ruby }} macOS
     runs-on: macos-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -20,7 +25,7 @@ jobs:
           architecture: 'x64'
       - name: Update gems
         run: |
-          sudo gem install bundler -v "~> 2" --force
+          sudo gem install bundler --force
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |

data/.github/workflows/ubuntu.yml

@@ -1,14 +1,19 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: ubuntu
 
-on: [push]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ '**' ]
 
 jobs:
   test-linux:
     name: Test on Ruby ${{ matrix.ruby }} Ubuntu
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -20,7 +25,7 @@ jobs:
           architecture: 'x64'
       - name: Update gems
         run: |
-          gem install bundler -v "~> 2"
+          gem install bundler
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |

data/.github/workflows/windows.yml

@@ -1,14 +1,19 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: windows
 
-on: [push]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ '**' ]
 
 jobs:
   test-windows:
     name: Test on Ruby ${{ matrix.ruby }} Windows
     runs-on: windows-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -21,7 +26,7 @@ jobs:
       - name: Update gems
         shell: pwsh
         run: |
-          gem install bundler -v "~> 2"
+          gem install bundler
           bundle config --local path vendor/bundle
           bundle update
           bundle install --jobs 4 --retry 3

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/docs/README.adoc

@@ -18,7 +18,7 @@ The following commands are provided.
 
 [source,console]
 ----
-$ relaton concatenate Source-Directory Relaton-Collection-File -t TITLE -g ORGANIZATION -n
+$ relaton concatenate Source-Directory Relaton-Collection-File -t TITLE -g ORGANIZATION
 ----
 
 Iterates through all the Relaton files (YAML and XML) in `Source-Directory`, and concatenates them into a Relaton Collection file. The extension of the Collection file can be set using the `Relaton-Collection-File` file name (i.e, if it uses an extension of `yaml`, a Relaton YAML file will be created; if `rxl`, a Relaton XML file will be created, or via the `-x [ext]` (or `--extension`) option.
@@ -29,20 +29,16 @@ 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-File` 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 Relaton-Collection-File Relaton-File-Directory -x rxl -n
+$ relaton split Relaton-Collection-File Relaton-File-Directory -x rxl
 ----
 
 Splits a `Relaton-Collection-File` into multiple files in the `Relaton-File-Directory`, and it also
 suports an additional `-x` or `--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]
@@ -146,7 +142,6 @@ Sample HTML output for a bibliographic entry:
 </div>
 ----
 
-[[relaton-yaml]]
 === relaton yaml2xml
 
 [source,console]
@@ -156,67 +151,7 @@ $ relaton yaml2xml YAML -o OUTPUT-DIRECTORY -x RELATON_EXTENSION -p PREFIX -r LI
 
 Convert a Relaton YAML file (`filename.yaml`) into a Relaton XML file (`filename.xml`). If the Relaton YAML file specifies multiple bibliograph items, and `OUTPUT-DIRECTORY` is nominated, also convert the file into a list of Relaton XML files for each entry, stored in that directory. The document identifier is used as the name of each Relaton XML file; the Relaton XML filename is suffixed with `RELATON_EXTENSION` (default `.rxl`) and prefixed with `PREFIX` (default empty). Any libraries that need to be required for the conversion are specified in `LIBRARY` as a space-delimited list.
 
-A Relaton Colleciton YAML file contains some initial metadata, and a list of metadata about each bibliographic entry. A Relaton YAML file describing an individual bibliographic entry is limited to metadata specific to that entry. The following illustrates the fields supported:
-
-[source,yaml]
-----
-htmlstylesheet: ./index-style.css
-root:
-  title: CalConnect Standards Registry
-  author: "CalConnect: The Calendaring and Scheduling Consortium"
-  items:
-    - technical_committee: TC VCARD
-      docidentifier: 18001
-      doctype: standard
-      title: "Date and time -- Representations for information interchange -- Part 1: Basic rules"
-      stage: Published
-      revdate: 2018-10-17
-      xml: standards/csd-datetime-explict/csd-datetime-explict.xml
-      html: standards/csd-datetime-explict/csd-datetime-explict.html
-      pdf: standards/csd-datetime-explict/csd-datetime-explict.pdf
-      doc: standards/csd-datetime-explict/csd-datetime-explict.doc
-      relaton: standards/csd-datetime-explict/cc-18001.xml
-    - technical_committee: TC PUBLISH
-      docidentifier: 10001
-      doctype: governance
-      title: "Standardization and publication"
-      stage: proposal
-      revdate: 2018-10-17
-      uri: standards/csd-standardization/csd-standardization.xml
-      agency: CalConnect
-      language: en
-      script: Latn
-      edition: 1
-----
-
-=== relaton xml2yaml
-
-[source,console]
-----
-$ relaton xml2yaml XML -o OUTPUT-DIRECTORY -x RELATON_EXTENSION -p PREFIX -r LIBRARY
-----
-
-Convert a Relaton XML file (`filename.xml` or `filename.rxl`) into a Relaton YAML file (`filename.yaml`). If the Relaton XML file is a collection, and `OUTPUT-DIRECTORY` is nominated, also convert the file into a list of Relaton YAML files for each entry, stored in that directory. The document identifier is used as the name of each Relaton XML file; the Relaton XML filename is suffixed with `RELATON_EXTENSION` (default `.yaml`) and prefixed with `PREFIX` (default empty). Any libraries that need to be required for the conversion are specified in `LIBRARY` as a space-delimited list.
-
-
-=== relaton yaml2html
-
-[source,console]
-----
-$ relaton yaml2xml <filename.yaml> [<stylesheet>] [<liquid-template-dir>]
-----
-
-Render a Relaton YAML file (`filename.yaml`) as an HTML file. The stylesheet and liquid-template-dir directories are as for <<relaton-xml2html,relaton xml2html>>.
-
-=== relaton yaml2xmlnew
-
-[source,console]
-----
-$ relaton yaml2xmlnew <filename.yaml> -o OUTPUT-DIRECTORY -x RELATON_EXTENSION -p PREFIX -r LIBRARY
-----
-
-Convert a Relaton YAML file (`filename.yaml`) in a new format into a Relaton XML file (`filename.xml`). If the Relaton YAML file specifies multiple bibliographic items, and `OUTPUT-DIRECTORY` is nominated, also convert the file into a list of Relaton XML files for each entry, stored in that directory. The document identifier is used as the name of each Relaton XML file; the Relaton XML filename is suffixed with `RELATON_EXTENSION` (default `.rxl`) and prefixed with `PREFIX` (default empty). Any libraries that need to be required for the conversion are specified in `LIBRARY` as a space-delimited list.
-
+[[relaton-yaml]]
 A Relaton Collection YAML file contains some initial metadata, and a list of metadata about each bibliographic entry:
 
 [source,yaml]
@@ -253,220 +188,23 @@ root:
         value: 2018-10-25
 ----
 
-A Relaton YAML file describing an individual bibliographic entry is limited to metadata specific to that entry. Flavor gems have additional fields. The following illustrates the common fields supported by all flavor gems (see link:https://github.com/relaton/relaton-bib/blob/master/docs/hash.adoc#yaml[Relaton YAML]):
-
-[source,yaml]
-----
----
-id: ISO/TC211
-title:
-- type: main
-  content: Geographic information
-  language: en
-  script: Latn
-  format: text/plain
-- content: Information géographique
-  language: fr
-  script: Latn
-  format: text/plain
-link:
-- type: src
-  content: https://www.iso.org/standard/53798.html
-- type: obp
-  content: https://www.iso.org/obp/ui/#!iso:std:53798:en
-- type: rss
-  content: https://www.iso.org/contents/data/standard/05/37/53798.detail.rss
-type: standard
-docid:
-  id: TC211
-  type: ISO
-docnumber: '123456'
-date:
-- type: issued
-  value: '2014-01-01'
-- type: published
-  value: '2014-04-01'
-- type: accessed
-  value: '2015-05-20'
-contributor:
-- organization:
-    name: International Organization for Standardization
-    abbreviation: ISO
-    subdivision: division
-    url: www.iso.org
-  role:
-    description: Publisher role
-    type: publisher
-- person:
-    name:
-      completename:
-        content: A. Bierman
-        language: en
-    affiliation:
-      organization:
-        name: IETF
-        abbreviation: IETF
-        identifier:
-          type: uri
-          id: www.ietf.org
-    contact:
-    - street:
-      - Street
-      city: City
-      state: State
-      country: Country
-      postcode: '123456'
-    - type: phone
-      value: '223322'
-  role: author
-- organization:
-    name: IETF
-    abbreviation: IETF
-    identifier:
-      type: uri
-      id: www.ietf.org
-  role: publisher
-- person:
-    name:
-      forename:
-        content: Forename
-        language: en
-      initial:
-        content: A.
-        language: en
-      surname:
-        content: Bierman
-        language: en
-      addition:
-        content: Addition
-        language: en
-      prefix:
-        content: Prefix
-        language: en
-    affiliation:
-      organization:
-        name: IETF
-        abbreviation: IETF
-      description:
-        content: Description
-        language: en
-    identifier:
-      type: uri
-      id: www.person.com
-    contact:
-    - street:
-      - Street
-      city: City
-      state: State
-      country: Country
-      postcode: '123456'
-    - type: phone
-      value: '223322'
-  role: author
-edition: '1'
-version:
-  revision_date: '2019-04-01'
-  draft: draft
-biblionote:
-  content: note
-  type: bibnote
-language:
-- en
-- fr
-script: Latn
-abstract:
-- content: ISO 19115-1:2014 defines the schema required for ...
-  language: en
-  script: Latn
-  format: text/plain
-- content: L'ISO 19115-1:2014 définit le schéma requis pour ...
-  language: fr
-  script: Latn
-  format: text/plain
-docstatus:
-  stage: stage
-  substage: substage
-  iteration: final
-copyright:
-  owner:
-    name: International Organization for Standardization
-    abbreviation: ISO
-    url: www.iso.org
-  from: '2014'
-  to: '2020'
-relation:
-- type: updates
-  bibitem:
-    formattedref:
-      content: ISO 19115:2003
-      format: text/plain
-  bib_locality:
-    type: updates
-    reference_from: Reference form
-- type: updates
-  bibitem:
-    type: standard
-    formattedref:
-      content: ISO 19115:2003/Cor 1:2006
-      format: text/plain
-series:
-- type: main
-  title:
-    type: original
-    content: ISO/IEC FDIS 10118-3
-    language: en
-    script: Latn
-    format: text/plain
-  place: Serie's place
-  organization: Serie's organization
-  abbreviation: ABVR
-  from: '2009-02-01'
-  to: '2010-12-20'
-  number: serie1234
-  partnumber: part5678
-- type: alt
-  formattedref:
-    content: serieref
-    language: en
-    script: Latn
-    format: text/plain
-medium:
-  form: medium form
-  size: medium size
-  scale: medium scale
-place: bib place
-extent:
-  type: section
-  reference_from: Reference from
-  reference_to: Reference to
-accesslocation:
-- accesslocation1
-- accesslocation2
-classification:
-  value: value
-  type: type
-validity:
-  begins: 2010-10-10 12:21
-  ends: 2011-02-03 18:30
-  revision: 2011-03-04 09:00
-fetched: '2019-08-16'
-----
+A Relaton YAML file describing an individual bibliographic entry is limited to metadata specific to that entry. Flavor gems have additional fields. The link:https://github.com/relaton/relaton-bib/blob/master/docs/hash.adoc#yaml[Relaton YAML] illustrates the common fields supported by all flavor gems.
 
-=== relaton xml2yamlnew
+=== relaton xml2yaml
 
 [source,console]
 ----
-$ relaton xml2yamlnew <filename.xml> -o OUTPUT-DIRECTORY -x RELATON_EXTENSION -p PREFIX -r LIBRARY
+$ relaton xml2yaml XML -o OUTPUT-DIRECTORY -x RELATON_EXTENSION -p PREFIX -r LIBRARY
 ----
 
-Convert a Relaton XML file (`filename.xml` or `filename.rxl`) into a Relaton YAML file (`filename.yaml`) in a new format. If the Relaton XML file is a collection, and `OUTPUT-DIRECTORY` is nominated, also convert the file into a list of Relaton YAML files for each entry, stored in that directory. The document identifier is used as the name of each Relaton XML file; the Relaton XML filename is suffixed with `RELATON_EXTENSION` (default `.yaml`) and prefixed with `PREFIX` (default empty). Any libraries that need to be required for the conversion are specified in `LIBRARY` as a space-delimited list.
+Convert a Relaton XML file (`filename.xml` or `filename.rxl`) into a Relaton YAML file (`filename.yaml`). If the Relaton XML file is a collection, and `OUTPUT-DIRECTORY` is nominated, also convert the file into a list of Relaton YAML files for each entry, stored in that directory. The document identifier is used as the name of each Relaton XML file; the Relaton XML filename is suffixed with `RELATON_EXTENSION` (default `.yaml`) and prefixed with `PREFIX` (default empty). Any libraries that need to be required for the conversion are specified in `LIBRARY` as a space-delimited list.
 
-=== relaton yaml2htmlnew
+=== relaton yaml2html
 
 [source,console]
 ----
-$ relaton yaml2xmlnew <filename.yaml> [<stylesheet>] [<liquid-template-dir>]
+$ relaton yaml2html YAML [<stylesheet>] [<liquid-template-dir>]
 ----
 
-Render a Relaton YAML file in a new format (`filename.yaml`) as an HTML file. The `stylesheet` and `liquid-template-dir` directories are as for <<relaton xml2html,relaton xml2html>>.
+Render a Relaton YAML file (`filename.yaml`) as an HTML file. The `stylesheet` and `liquid-template-dir` directories are as for <<relaton-xml2html,relaton xml2html>>.
 

data/lib/relaton/bibcollection.rb

@@ -9,7 +9,7 @@ module Relaton
       items
       doctype
       author
-    ]
+    ].freeze
 
     attr_accessor *ATTRIBS
 
@@ -17,16 +17,14 @@ module Relaton
       self.items = []
       ATTRIBS.each do |k|
         value = options[k] || options[k.to_s]
-        self.send("#{k}=", value)
+        send("#{k}=", value)
       end
-      self.items = (self.items || []).inject([]) do |acc, item|
+      self.items = (items || []).reduce([]) do |acc, item|
         acc << if item.is_a?(::Relaton::Bibcollection) || item.is_a?(::Relaton::Bibdata)
-          item
-        else
-          new_bib_item_class(item)
-        end
+                 item
+               else new_bib_item_class(item)
+               end
       end
-      self
     end
 
     # arbitrary number, must sort after all bib items
@@ -39,7 +37,7 @@ module Relaton
       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 | ./bibitem", item)
+        bibdata = find("./bibdata", item)
         klass = bibdata ? Bibdata : Bibcollection
         klass.from_xml(bibdata || item)
       end
@@ -48,16 +46,16 @@ module Relaton
     end
 
     def new_bib_item_class(options)
-      if options["items"]
-        options[:new] ? ::Relaton::BibcollectionNew(options) : ::Relaton::Bibcollection.new(options)
+      if options.is_a?(Hash) && options["items"]
+        ::Relaton::Bibcollection.new(options)
       else
-        options[:new] ? ::Relaton::BibdataNew(options) : ::Relaton::Bibdata.new(options)
+        ::Relaton::Bibdata.new(options)
       end
     end
 
     def items_flattened
       items.sort_by! do |b|
-        b.doc_number
+        b.docnumber
       end
 
       items.inject([]) do |acc,item|

data/lib/relaton/bibdata.rb

@@ -2,46 +2,34 @@ require "date"
 
 module Relaton
   class Bibdata
-    ATTRIBS = %i[
-      docidentifier
-      doctype
-      title
-      stage
-      relation
-      xml
-      pdf
-      doc
-      html
-      uri
-      rxl
-      txt
-      revdate
-      abstract
-      technical_committee
-      copyright_from
-      copyright_owner
-      contributor_author_role
-      contributor_author_organization
-      contributor_author_person
-      contributor_publisher_role
-      contributor_publisher_organization
-      language
-      script
-      edition
-      datetype
-      bib_rxl
-      ref
-    ]
-
-    attr_accessor *ATTRIBS
-
-    def initialize(options)
-      options.each_pair do |k,v|
-        send("#{k.to_s}=", v)
-      end
-      self
+    URL_TYPES = %i[uri xml pdf doc html rxl txt]
+
+    attr_reader :bibitem
+
+    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
 
+    # def doctype
+    #   @bibitem.type
+    # end
+
     # From http://gavinmiller.io/2016/creating-a-secure-sanitization-function/
     FILENAME_BAD_CHARS = [ '/', '\\', '?', '%', '*', ':', '|', '"', '<', '>', '.', ' ' ]
 
@@ -58,78 +46,48 @@ module Relaton
     end
 
     def self.from_xml(source)
-      new(Relaton::XmlDocument.parse(source))
+      new(Relaton::Cli.parse_xml(source))
     end
 
     def to_xml(opts = {})
-      #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"
-      ret += "<title>#{title}</title>\n"
-      ret += "<docidentifier>#{docidentifier}</docidentifier>\n" if docidentifier
-      ret += "<uri>#{uri}</uri>\n" if uri
-      ret += "<uri type='xml'>#{xml}</uri>\n" if xml
-      ret += "<uri type='html'>#{html}</uri>\n" if html
-      ret += "<uri type='pdf'>#{pdf}</uri>\n" if pdf
-      ret += "<uri type='doc'>#{doc}</uri>\n" if doc
-      ret += "<uri type='rxl'>#{rxl}</uri>\n" if rxl
-
-      ret += "<language>#{language}</language>\n"
-      ret += "<script>#{script}</script>\n"
-
-      if copyright_from
-        ret += "<copyright>"
-        ret += "<from>#{copyright_from}</from>\n" if copyright_from
-        ret += "<owner><organization><name>#{copyright_owner}</name></organization></owner>\n" if copyright_owner
-        ret += "</copyright>"
-      end
+      options = { bibdata: true, date_format: :full }.merge opts.select { |k,v| k.is_a? Symbol }
+      @bibitem.to_xml nil, **options
 
-      if contributor_author_role
-        ret += "<contributor>\n"
-        ret += "<role type='author'/>\n"
-        ret += "<organization><name>#{contributor_author_organization}</name></organization>\n"
-        ret += "</contributor>\n"
-      end
+      # #datetype = stage&.casecmp("published") == 0 ? "published" : "circulated"
 
-      if contributor_author_person
-        Array(contributor_author_person).each do |name|
-          ret += "<contributor>\n"
-          ret += "<role type='author'/>\n"
-          ret += "<person><name><completename>#{name}</completename></name></person>\n"
-          ret += "</contributor>\n"
-        end
-      end
-
-      if contributor_publisher_role
-        ret += "<contributor>\n"
-        ret += "<role type='publisher'/>\n"
-        ret += "<organization><name>#{contributor_publisher_organization}</name></organization>\n"
-        ret += "</contributor>\n"
-      end
-
-      ret += "<date type='#{datetype}'><on>#{revdate}</on></date>\n" if revdate
-      # ret += "<contributor><role type='author'/><organization><name>#{agency}</name></organization></contributor>" if agency
-      # ret += "<contributor><role type='publisher'/><organization><name>#{agency}</name></organization></contributor>" if agency
-      ret += "<edition>#{edition}</edition>\n" if edition
-      ret += "<language>#{language}</language>\n" if language
-      ret += "<script>#{script}</script>\n" if script
-      ret += "<abstract>#{abstract}</abstract>\n" if abstract
-      ret += "<status>#{stage}</status>\n" if stage
-      ret += "<editorialgroup><technical-committee>#{technical_committee}</technical-committee></editorialgroup>\n" if technical_committee
-      ret += ref ? "</bibitem>\n" : "</bibdata>\n"
+      # ret = ref ? "<bibitem id= '#{ref}' type='#{doctype}'>\n" : "<bibdata type='#{doctype}'>\n"
+      # ret += "<fetched>#{Date.today.to_s}</fetched>\n"
     end
 
     def to_h
-      ATTRIBS.inject({}) do |acc, k|
-        value = send(k)
-        acc[k.to_s] = value unless value.nil?
-        acc
+      URL_TYPES.reduce(@bibitem.to_hash) do |h, t|
+        value = self.send t
+        h[t.to_s] = value
+        h
       end
     end
 
     def to_yaml
       to_h.to_yaml
     end
+
+    def method_missing(meth, *args)
+      if @bibitem.respond_to?(meth)
+        @bibitem.send meth, *args
+      elsif URL_TYPES.include? meth
+        link = @bibitem.link.detect { |l| l.type == meth.to_s || meth == :uri && l.type.nil? }
+        link&.content&.to_s
+      elsif URL_TYPES.include? meth.match(/^\w+(?==)/).to_s.to_sym
+        /^(?<type>\w+)/ =~ meth
+        link = @bibitem.link.detect { |l| l.type == type || type == "uri" && l.type.nil? }
+        if link
+          link.content = args[0]
+        else
+          @bibitem.link << RelatonBib::TypedUri.new(type: type, content: args[0])
+        end
+      else
+        super
+      end
+    end
   end
 end