relaton-bib 0.3.6 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2652e6a30640ef8035238e6ae6126063b9057890
-  data.tar.gz: 03f6a59bf6dd3d152578073e55d5d35b235bfc34
+SHA256:
+  metadata.gz: 036777d6efe6a40b3f0ec2e6c1e1acfaf793d556cbaf907f330ee867716dc5b8
+  data.tar.gz: c16adf3cedb42c0521266792c1fefbdae2081a3a5561dda64fa373965e24f225
 SHA512:
-  metadata.gz: 6ead52473fc5af8a5c86d9fce36bc048f383c3740c2047a7fd7bfc26cfd3f6211587842a0a5add6cdc7d1060e4d9d1d6f167b4e20fb751f8482f3c2a53be2e68
-  data.tar.gz: 540bccaead183468e59e4ea8b3edc64352d1d1df1c12ca6f3a09e4e8f7c3c2f891681490a5f7d548412833dcdc9c05b96839e8a134306b1e464d92041148e863
+  metadata.gz: f03693eca920a087d1a0e1f7d2ff0d30a69e4a70fabc4a68f2ce92dff39a091e871eb9dbdf51cbd637af12b7b88ab0b0ce8000cf8dd7e78e7ca76b0d788c23ad
+  data.tar.gz: 571a1e896ad96a4b7c76a32c12596694ea8528c91fab2a14c5d93106dd4c8f10ae73823fee8e5c6123a8e0a095ae6bb1425234e52cce21268dc503cb108e62f7

data/.github/workflows/macos.yml

@@ -0,0 +1,27 @@
+# Auto-generated !!! Do not edit it manually
+# use ci-master https://github.com/metanorma/metanorma-build-scripts
+name: macos
+
+on: [push]
+
+jobs:
+  test-macos:
+    name: Test on Ruby ${{ matrix.ruby }} macOS
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        ruby: [ '2.6', '2.5', '2.4' ]
+    steps:
+      - uses: actions/checkout@master
+      - name: Use Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          architecture: 'x64'
+      - name: Update gems
+        run: |
+          sudo gem install bundler -v "~> 2" --force
+          bundle install --jobs 4 --retry 3
+      - name: Run specs
+        run: |
+          bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -0,0 +1,27 @@
+# Auto-generated !!! Do not edit it manually
+# use ci-master https://github.com/metanorma/metanorma-build-scripts
+name: ubuntu
+
+on: [push]
+
+jobs:
+  test-linux:
+    name: Test on Ruby ${{ matrix.ruby }} Ubuntu
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.6', '2.5', '2.4' ]
+    steps:
+      - uses: actions/checkout@master
+      - name: Use Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          architecture: 'x64'
+      - name: Update gems
+        run: |
+          gem install bundler -v "~> 2"
+          bundle install --jobs 4 --retry 3
+      - name: Run specs
+        run: |
+          bundle exec rake

data/.github/workflows/windows.yml

@@ -0,0 +1,30 @@
+# Auto-generated !!! Do not edit it manually
+# use ci-master https://github.com/metanorma/metanorma-build-scripts
+name: windows
+
+on: [push]
+
+jobs:
+  test-windows:
+    name: Test on Ruby ${{ matrix.ruby }} Windows
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        ruby: [ '2.6', '2.5', '2.4' ]
+    steps:
+      - uses: actions/checkout@master
+      - name: Use Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          architecture: 'x64'
+      - name: Update gems
+        shell: pwsh
+        run: |
+          gem install bundler -v "~> 2"
+          bundle config --local path vendor/bundle
+          bundle update
+          bundle install --jobs 4 --retry 3
+      - name: Run specs
+        run: |
+          bundle exec rake

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton-bib (0.3.6)
+    relaton-bib (0.3.11)
       addressable
       nokogiri
 

data/docs/hash.adoc

@@ -273,7 +273,7 @@ for the entry, the subclause title should be left as `{blank}`.
 
 So the following is a very simple reference in Metanorma Asciidoctor:
 
-[source,asciidoctor]
+[source,asciidoc]
 ----
 [%bibitem]
 === Rubber latex -- Sampling
@@ -291,7 +291,7 @@ The anchor crossreference for the bibliographic entry may be encoded as the
 `id` entry in the definition list, or as the normal Asciidoctor anchor on the
 subclause, which takes priority over it:
 
-[source,asciidoctor]
+[source,asciidoc]
 ----
 [[iso123]]
 [%bibitem]
@@ -306,7 +306,7 @@ Asciidoctor does not currently cope with definition lists more than four levels
 deep. If deeper nesting is needed, you will need to attach a new definition
 list with a list continuation:
 
-[source,asciidoctor]
+[source,asciidoc]
 ----
 [[iso123]]
 [%bibitem]
@@ -555,7 +555,7 @@ The foregoing structure requires frequent breakouts into open blocks, to deal
 with the limitation on Asciidoctor nested definition lists. An alternative is to
 represent the nested structure of Relaton records in a simple, one-level definition list, and to use the key for each key-value pair to represent the hierarchical nesting of entries, as a dot-delimited path of keys. For example,
 
-[source,asciidoctor]
+[source,asciidoc]
 ----
 [%bibitem]
 === Rubber latex -- Sampling
@@ -567,7 +567,7 @@ docid::
 
 can instead be represented as:
 
-[source,asciidoctor]
+[source,asciidoc]
 ----
 [%bibitem]
 === Rubber latex -- Sampling
@@ -578,7 +578,7 @@ docid.id::: ISO 123
 
 Whenever part of the key is repeated between entries, the entries are assumed to attach to the same parent. If an array of hashes is needed, a blank entry is required for the key of each repeating element: For example,
 
-[source,asciidoctor]
+[source,asciidoc]
 ----
 [%bibitem]
 === Rubber latex -- Sampling
@@ -594,7 +594,7 @@ type:: standard
 
 can instead be represented as:
 
-[source,asciidoctor]
+[source,asciidoc]
 ----
 [%bibitem]
 === Rubber latex -- Sampling
@@ -609,7 +609,7 @@ docid.id:: 32784
 
 Embedded elements can also repeat:
 
-[source,asciidoctor]
+[source,asciidoc]
 ----
 [%bibitem]
 ...
@@ -629,7 +629,7 @@ person::
 
 can instead be represented as:
 
-[source,asciidoctor]
+[source,asciidoc]
 ----
 [%bibitem]
 ...

data/lib/relaton_bib/biblio_version.rb

@@ -20,7 +20,7 @@ module RelatonBib
       # @param builder [Nokogiri::XML::Builder]
       def to_xml(builder)
         builder.version do
-          builder.revision_date revision_date if revision_date
+          builder.send("revision-date", revision_date) if revision_date
           draft.each { |d| builder.draft d }
         end
       end

data/lib/relaton_bib/bibliographic_date.rb

@@ -6,8 +6,7 @@ module RelatonBib
   # Bibliographic date.
   class BibliographicDate
     TYPES = %w[published accessed created implemented obsoleted confirmed
-               updated issued transmitted copied unchanged circulated
-    ].freeze
+               updated issued transmitted copied unchanged circulated adapted].freeze
 
     # @return [String]
     attr_reader :type
@@ -28,7 +27,7 @@ module RelatonBib
     def initialize(type:, on: nil, from: nil, to: nil)
       raise ArgumentError, "expected :on or :from argument" unless on || from
 
-      raise ArgumentError, "invalid type: #{type}" unless TYPES.include? type
+      # raise ArgumentError, "invalid type: #{type}" unless TYPES.include? type
 
       @type = type
       @on   = RelatonBib.parse_date on

data/lib/relaton_bib/bibliographic_item.rb

@@ -169,7 +169,7 @@ module RelatonBib
     # @option link [String] :content
     def initialize(**args)
       if args[:type] && !TYPES.include?(args[:type])
-        raise ArgumentError, %{Type "#{args[:type]}" is invalid.}
+        warn %{Document type "#{args[:type]}" is invalid.}
       end
 
       @title = (args[:title] || []).map do |t|
@@ -284,6 +284,7 @@ module RelatonBib
       hash["contributor"] = single_element_array(contributor) if contributor&.any?
       hash["edition"] = edition if edition
       hash["version"] = version.to_hash if version
+      hash["revdate"] = revdate if revdate
       hash["biblionote"] = single_element_array(biblionote) if biblionote&.any?
       hash["language"] = single_element_array(language) if language&.any?
       hash["script"] = single_element_array(script) if script&.any?
@@ -303,6 +304,16 @@ module RelatonBib
       hash
     end
 
+    # If revision_date exists then returns it else returns published date or nil
+    # @return [String, NilClass]
+    def revdate
+      @revdate ||= if version&.revision_date
+                     version.revision_date
+                   else
+                     date.detect { |d| d.type == "published" }&.on&.to_s
+                   end
+    end
+
     private
 
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength

data/lib/relaton_bib/formatted_string.rb

@@ -13,8 +13,8 @@ module RelatonBib
     attr_reader :format
 
     # @param content [String]
-    # @param language [String] language code Iso639
-    # @param script [String] script code Iso15924
+    # @param language [String, NilClass] language code Iso639
+    # @param script [String, NilClass] script code Iso15924
     # @param format [String] the content type
     def initialize(content:, language: nil, script: nil, format: "text/plain")
       # if format && !FORMATS.include?(format)

data/lib/relaton_bib/hash_converter.rb

@@ -35,6 +35,7 @@ module RelatonBib
 
       def extent_hash_to_bib(ret)
         return unless ret[:extent]
+
         ret[:extent] = array(ret[:extent])
         ret[:extent]&.each_with_index do |e, i|
           ret[:extent][i] = BibItemLocality.new(e[:type], e[:reference_from],
@@ -44,45 +45,57 @@ module RelatonBib
 
       def title_hash_to_bib(ret)
         return unless ret[:title]
+
         ret[:title] = array(ret[:title])
         ret[:title] = ret[:title].map do |t|
-          t.is_a?(Hash) ? t : { content: t, language: "en", script: "Latn", 
-                                format: "text/plain", type: "main" }
+          if t.is_a?(Hash) then t
+          else
+            { content: t, language: "en", script: "Latn", format: "text/plain", type: "main" }
+          end
         end
       end
 
       def language_hash_to_bib(ret)
         return unless ret[:language]
+
         ret[:language] = array(ret[:language])
       end
 
       def script_hash_to_bib(ret)
         return unless ret[:script]
+
         ret[:script] = array(ret[:script])
       end
 
       def abstract_hash_to_bib(ret)
         return unless ret[:abstract]
-        ret[:abstract] = array(ret[:abstract])
+
+        ret[:abstract] = array(ret[:abstract]).map do |a|
+          a.is_a?(String) ? FormattedString.new(content: a) : a
+        end
       end
 
       def link_hash_to_bib(ret)
         return unless ret[:link]
+
         ret[:link] = array(ret[:link])
       end
 
       def place_hash_to_bib(ret)
         return unless ret[:place]
+
         ret[:place] = array(ret[:place])
       end
 
       def accesslocation_hash_to_bib(ret)
         return unless ret[:accesslocation]
+
         ret[:accesslocation] = array(ret[:accesslocation])
       end
 
       def dates_hash_to_bib(ret)
         return unless ret[:date]
+
         ret[:date] = array(ret[:date])
         ret[:date].each_with_index do |d, i|
           # value is synonym of on: it is reserved word in YAML
@@ -95,6 +108,7 @@ module RelatonBib
 
       def docid_hash_to_bib(ret)
         return unless ret[:docid]
+
         ret[:docid] = array(ret[:docid])
         ret[:docid]&.each_with_index do |id, i|
           ret[:docid][i] = DocumentIdentifier.new(id: id[:id], type: id[:type])
@@ -103,32 +117,35 @@ module RelatonBib
 
       def version_hash_to_bib(ret)
         return unless ret[:version]
+
         ret[:version][:draft] = array(ret[:version][:draft])
-        ret[:version] and ret[:version] = BibliographicItem::Version.new(
-            ret[:version][:revision_date], ret[:version][:draft])
+        ret[:version] && ret[:version] = BibliographicItem::Version.new(
+          ret[:version][:revision_date], ret[:version][:draft]
+        )
       end
 
       def biblionote_hash_to_bib(ret)
         return unless ret[:biblionote]
+
         ret[:biblionote] = array(ret[:biblionote])
         (ret[:biblionote])&.each_with_index do |n, i|
-          ret[:biblionote][i] =
-            BiblioNote.new(content: n[:content], type: n[:type], 
-                          language: n[:language], 
-                          script: n[:script], format: n[:format])
+          ret[:biblionote][i] = BiblioNote.new(
+            content: n[:content], type: n[:type], language: n[:language],
+            script: n[:script], format: n[:format]
+          )
         end
       end
 
       def formattedref_hash_to_bib(ret)
-        ret[:formattedref] and ret[:formattedref] =
-          formattedref(ret[:formattedref])
+        ret[:formattedref] && ret[:formattedref] = formattedref(ret[:formattedref])
       end
 
       def docstatus_hash_to_bib(ret)
-        ret[:docstatus] and ret[:docstatus] =
-          DocumentStatus.new(stage: ret[:docstatus][:stage],
-                            substage: ret[:docstatus][:substage],
-                            iteration: ret[:docstatus][:iteration])
+        ret[:docstatus] && ret[:docstatus] = DocumentStatus.new(
+          stage: ret[:docstatus][:stage],
+          substage: ret[:docstatus][:substage],
+          iteration: ret[:docstatus][:iteration],
+        )
       end
 
       def contributors_hash_to_bib(ret)
@@ -146,73 +163,83 @@ module RelatonBib
             end
           end
           ret[:contributor][i][:role] = roles
-          ret[:contributor][i][:entity] = c[:person] ?
-            person_hash_to_bib(c[:person]) : org_hash_to_bib(c[:organization])
+          ret[:contributor][i][:entity] = if c[:person]
+                                            person_hash_to_bib(c[:person])
+                                          else
+                                            org_hash_to_bib(c[:organization])
+                                          end
           ret[:contributor][i].delete(:person)
           ret[:contributor][i].delete(:organization)
         end
       end
 
-      def org_hash_to_bib(c)
-        return nil if c.nil?
-        c[:identifier] = array(c[:identifier])&.map do |a|
+      def org_hash_to_bib(org)
+        return nil if org.nil?
+
+        org[:identifier] = array(org[:identifier])&.map do |a|
           OrgIdentifier.new(a[:type], a[:id])
         end
-        c
+        org
       end
 
-      def person_hash_to_bib(c)
+      def person_hash_to_bib(person)
         Person.new(
-          name: fullname_hash_to_bib(c),
-          affiliation: affiliation_hash_to_bib(c),
-          contact: contacts_hash_to_bib(c),
-          identifier: person_identifiers_hash_to_bib(c),
+          name: fullname_hash_to_bib(person),
+          affiliation: affiliation_hash_to_bib(person),
+          contact: contacts_hash_to_bib(person),
+          identifier: person_identifiers_hash_to_bib(person),
         )
       end
 
-      def fullname_hash_to_bib(c)
-        n = c[:name]
+      def fullname_hash_to_bib(person)
+        n = person[:name]
         FullName.new(
-          forename: array(n[:forename])&.map { |f| localname(f, c) },
-          initial: array(n[:initial])&.map { |f| localname(f, c) },
-          addition: array(n[:addition])&.map { |f| localname(f, c) },
-          prefix: array(n[:prefix])&.map { |f| localname(f, c) },
-          surname: localname(n[:surname], c),
-          completename: localname(n[:completename], c),
+          forename: array(n[:forename])&.map { |f| localname(f, person) },
+          initial: array(n[:initial])&.map { |f| localname(f, person) },
+          addition: array(n[:addition])&.map { |f| localname(f, person) },
+          prefix: array(n[:prefix])&.map { |f| localname(f, person) },
+          surname: localname(n[:surname], person),
+          completename: localname(n[:completename], person),
         )
       end
 
-      def person_identifiers_hash_to_bib(c)
-        array(c[:identifier])&.map do |a|
+      def person_identifiers_hash_to_bib(person)
+        array(person[:identifier])&.map do |a|
           PersonIdentifier.new(a[:type], a[:id])
         end
       end
 
-      def affiliation_hash_to_bib(c)
-        return [] unless c[:affiliation]
-        array(c[:affiliation]).map do |a|
+      def affiliation_hash_to_bib(person)
+        return [] unless person[:affiliation]
+
+        array(person[:affiliation]).map do |a|
           a[:description] = array(a[:description])&.map do |d|
-            FormattedString.new(
-              d.is_a?(Hash) ?
-              { content: d[:content], language: d[:language],
-                script: d[:script], format: d[:format] } : 
-            { content: d })
+            cnt = if d.is_a?(Hash)
+                    { content: d[:content], language: d[:language],
+                      script: d[:script], format: d[:format] }
+                  else { content: d }
+                  end
+            FormattedString.new cnt
           end
           Affilation.new(
             organization: Organization.new(org_hash_to_bib(a[:organization])),
-            description: a[:description]
+            description: a[:description],
           )
         end
       end
 
-      def contacts_hash_to_bib(c)
-        return [] unless c[:contact]
-        array(c[:contact]).map do |a|
-          (a[:city] || a[:country]) ?
+      def contacts_hash_to_bib(person)
+        return [] unless person[:contact]
+
+        array(person[:contact]).map do |a|
+          if a[:city] || a[:country]
             RelatonBib::Address.new(
               street: Array(a[:street]), city: a[:city], postcode: a[:postcode],
-              country: a[:country], state: a[:state]) :
-          RelatonBib::Contact.new(type: a[:type], value: a[:value])
+              country: a[:country], state: a[:state]
+            )
+          else
+            RelatonBib::Contact.new(type: a[:type], value: a[:value])
+          end
         end
       end
 
@@ -227,14 +254,14 @@ module RelatonBib
       end
 
       # @param ret [Hash]
-      # @param r [Hash] relation
-      # @param i [Integr] index of relation
-      def relation_bibitem_hash_to_bib(ret, r, i)
-        if r[:bibitem]
-          ret[:relation][i][:bibitem] = bib_item(hash_to_bib(r[:bibitem], true))
+      # @param rel [Hash] relation
+      # @param idx [Integr] index of relation
+      def relation_bibitem_hash_to_bib(ret, rel, idx)
+        if rel[:bibitem]
+          ret[:relation][idx][:bibitem] = bib_item(hash_to_bib(rel[:bibitem], true))
         else
-          warn "bibitem missing: #{r}"
-          ret[:relation][i][:bibitem] = nil
+          warn "bibitem missing: #{rel}"
+          ret[:relation][idx][:bibitem] = nil
         end
       end
 
@@ -244,9 +271,9 @@ module RelatonBib
         BibliographicItem.new(item)
       end
 
-      def relation_biblocality_hash_to_bib(ret, r, i)
-        ret[:relation][i][:bib_locality] =
-          array(r[:bib_locality])&.map do |bl|
+      def relation_biblocality_hash_to_bib(ret, rel, idx)
+        ret[:relation][idx][:bib_locality] =
+          array(rel[:bib_locality])&.map do |bl|
             BibItemLocality.new(bl[:type], bl[:reference_from],
                                 bl[:reference_to])
           end
@@ -271,7 +298,7 @@ module RelatonBib
       end
 
       def medium_hash_to_bib(ret)
-        ret[:medium] and ret[:medium] = Medium.new(ret[:medium])
+        ret[:medium] = Medium.new(ret[:medium]) if ret[:medium]
       end
 
       def classification_hash_to_bib(ret)
@@ -279,52 +306,70 @@ module RelatonBib
         # ret[:classification]&.each_with_index do |c, i|
         # ret[:classification][i] = RelatonBib::Classification.new(c)
         # end
-        ret[:classification] and
+        if ret[:classification]
           ret[:classification] = Classification.new(ret[:classification])
+        end
       end
 
       def validity_hash_to_bib(ret)
         return unless ret[:validity]
-        ret[:validity][:begins] and b = Time.parse(ret[:validity][:begins])
-        ret[:validity][:ends] and e = Time.parse(ret[:validity][:ends])
-        ret[:validity][:revision] and r = Time.parse(ret[:validity][:revision])
+
+        ret[:validity][:begins] && b = Time.parse(ret[:validity][:begins])
+        ret[:validity][:ends] && e = Time.parse(ret[:validity][:ends])
+        ret[:validity][:revision] && r = Time.parse(ret[:validity][:revision])
         ret[:validity] = Validity.new(begins: b, ends: e, revision: r)
       end
 
+      # @param ogj [Hash, Array, String]
+      # @return [Hash, Array, String]
       def symbolize(obj)
-        obj.is_a? Hash and
-          return obj.inject({}){|memo,(k,v)| memo[k.to_sym] =  symbolize(v); memo}
-        obj.is_a? Array and
-          return obj.inject([]){|memo,v    | memo           << symbolize(v); memo}
-        return obj
+        if obj.is_a? Hash
+          obj.reduce({}) do |memo, (k, v)|
+            memo[k.to_sym] = symbolize(v)
+            memo
+          end
+        elsif obj.is_a? Array
+          obj.reduce([]) { |memo, v| memo << symbolize(v) }
+        else
+          obj
+        end
       end
 
-      def array(a)
-        return [] unless a
-        return [a] unless a.is_a?(Array)
-        a
+      def array(arr)
+        return [] unless arr
+        return [arr] unless arr.is_a?(Array)
+
+        arr
       end
 
-      def localname(f, c)
-        return nil if f.nil?
-        f.is_a?(Hash) and lang = f[:language] 
-        lang ||= c[:name][:language] 
-        f.is_a?(Hash) and script = f[:script] 
-        script ||= c[:name][:script]
-        f.is_a?(Hash) ?
-          RelatonBib::LocalizedString.new(f[:content], lang, script) :
-          RelatonBib::LocalizedString.new(f, lang, script)
+      def localname(name, person)
+        return nil if name.nil?
+
+        lang = name[:language] if name.is_a?(Hash)
+        lang ||= person[:name][:language]
+        script = name[:script] if name.is_a?(Hash)
+        script ||= person[:name][:script]
+        if name.is_a?(Hash)
+          RelatonBib::LocalizedString.new(name[:content], lang, script)
+        else
+          RelatonBib::LocalizedString.new(name, lang, script)
+        end
       end
 
-      def localizedstring(f)
-        f.is_a?(Hash) ?
-          RelatonBib::LocalizedString.new(f[:content], f[:language], f[:script]) :
-          RelatonBib::LocalizedString.new(f)
+      def localizedstring(lst)
+        if lst.is_a?(Hash)
+          RelatonBib::LocalizedString.new(lst[:content], lst[:language], lst[:script])
+        else
+          RelatonBib::LocalizedString.new(lst)
+        end
       end
 
-      def formattedref(f)
-        f.is_a?(Hash) ? RelatonBib::FormattedRef.new(f) :
-          RelatonBib::FormattedRef.new(content: f)
+      def formattedref(frf)
+        if frf.is_a?(Hash)
+          RelatonBib::FormattedRef.new(frf)
+        else
+          RelatonBib::FormattedRef.new(content: frf)
+        end
       end
     end
   end

data/lib/relaton_bib/hit.rb

@@ -4,7 +4,7 @@ module RelatonBib
     attr_reader :hit
 
     # @param hit [Hash]
-    # @param hit_collection [RelatonNist:HitCollection]
+    # @param hit_collection [RelatonIso::HitCollection, RelatonNist:HitCollection]
     def initialize(hit, hit_collection = nil)
       @hit            = hit
       @hit_collection = hit_collection

data/lib/relaton_bib/hit_collection.rb

@@ -9,7 +9,7 @@ module RelatonBib
     # @return [String]
     attr_reader :year
 
-    # @return [Iecbib::HitCollection]
+    # @return [RelatonIso::HitCollection]
     def fetch
       workers = WorkersPool.new 4
       workers.worker(&:fetch)

data/lib/relaton_bib/typed_title_string.rb

@@ -45,9 +45,16 @@ module RelatonBib
 
     # @return [Hash]
     def to_hash
-      hash = {}
-      hash["type"] = type if type
-      hash.merge title.to_hash
+      th = title.to_hash
+      return th unless type
+
+      hash = { "type" => type }
+      if th.is_a? String
+        hash["content"] = th
+      else
+        hash.merge! th
+      end
+      hash
     end
   end
 end

data/lib/relaton_bib/typed_uri.rb

@@ -6,7 +6,7 @@ module RelatonBib
     # @return [Symbol] :src/:obp/:rss
     attr_reader :type
     # @retutn [URI]
-    attr_reader :content
+    attr_accessor :content
 
     # @param type [String] src/obp/rss
     # @param content [String]

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "0.3.6".freeze
+  VERSION = "0.3.11".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -5,7 +5,8 @@ module RelatonBib
     class << self
       def from_xml(xml)
         doc = Nokogiri::XML(xml)
-        bibitem = doc.at "/bibitem"
+        doc.remove_namespaces!
+        bibitem = doc.at "/bibitem|/bibdata"
         BibliographicItem.new(item_data(bibitem))
       end
 
@@ -29,8 +30,8 @@ module RelatonBib
           edition: bibitem.at("./edition")&.text,
           version: fetch_version(bibitem),
           biblionote: fetch_note(bibitem),
-          language: bibitem.xpath("./language").map(&:text),
-          script: bibitem.xpath("./script").map(&:text),
+          language: fetch_language(bibitem),
+          script: fetch_script(bibitem),
           abstract: fetch_abstract(bibitem),
           docstatus: fetch_status(bibitem),
           copyright: fetch_copyright(bibitem),
@@ -50,7 +51,7 @@ module RelatonBib
         version = item.at "./version"
         return unless version
 
-        revision_date = version.at("revision_date").text
+        revision_date = version.at("revision-date")&.text
         draft = version.xpath("draft").map &:text
         RelatonBib::BibliographicItem::Version.new revision_date, draft
       end
@@ -67,6 +68,14 @@ module RelatonBib
         end
       end
 
+      def fetch_language(item)
+        item.xpath("./language").reduce([]) { |a, l| l.text.empty? ? a : a << l.text }
+      end
+
+      def fetch_script(item)
+        item.xpath("./script").reduce([]) { |a, s| s.text.empty? ? a : a << s.text }
+      end
+
       # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
 
       def fetch_series(item)
@@ -145,8 +154,9 @@ module RelatonBib
         status = item.at("./status")
         return unless status
 
+        stage = status.at "stage"
         DocumentStatus.new(
-          stage: status.at("stage").text,
+          stage: stage ? stage.text : status.text,
           substage: status.at("substage")&.text,
           iteration: status.at("iteration")&.text,
         )
@@ -154,8 +164,9 @@ module RelatonBib
 
       def fetch_dates(item)
         item.xpath("./date").map do |d|
+          type = d[:type].to_s.empty? ? "published" : d[:type]
           RelatonBib::BibliographicDate.new(
-            type: d[:type], on: d.at("on")&.text, from: d.at("from")&.text,
+            type: type, on: d.at("on")&.text, from: d.at("from")&.text,
             to: d.at("to")&.text
           )
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2019-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -157,16 +157,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/macos.yml"
+- ".github/workflows/ubuntu.yml"
+- ".github/workflows/windows.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.adoc
 - Rakefile
-- appveyor.yml
 - bin/console
 - bin/setup
 - docs/hash.adoc
@@ -221,8 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: 'RelatonBib: Ruby XMLDOC impementation.'

data/.travis.yml

@@ -1,18 +0,0 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
-language: ruby
-cache: bundler
-os:
-- linux
-- osx
-rvm:
-- 2.6
-- 2.5
-- 2.4
-- ruby-head
-before_install: 
-- gem install bundler -v "~> 2"
-- bundle update
-matrix:
-  allow_failures:
-    - rvm: ruby-head

data/appveyor.yml

@@ -1,37 +0,0 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
-version: '{build}'
-
-cache:
-  - vendor/bundle
-
-environment:
-  matrix:
-    - RUBY_VERSION: 26
-    - RUBY_VERSION: 25
-    - RUBY_VERSION: 24
-    - RUBY_VERSION: _trunk
-
-matrix:
-  allow_failures:
-    - RUBY_VERSION: _trunk
-
-install:
-  - ps: . { iwr -useb https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/appveyor.ps1 } | iex
-  - refreshenv
-
-build_script:
-  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
-  - set GIT_TERMINAL_PROMPT=0
-  - gem install bundler -v "~> 2"
-  - bundle config --local path vendor/bundle
-  - bundle update
-  - bundle install
-
-before_test:
-  - ruby -v
-  - gem -v
-  - bundle -v
-
-test_script:
-  - bundle exec rake