relaton-bib 0.3.4 → 0.3.9

data/lib/relaton_bib/hit.rb

@@ -0,0 +1,32 @@
+module RelatonBib
+  class Hit
+    # @return [Array<Hash>]
+    attr_reader :hit
+
+    # @param hit [Hash]
+    # @param hit_collection [RelatonIso::HitCollection, RelatonNist:HitCollection]
+    def initialize(hit, hit_collection = nil)
+      @hit            = hit
+      @hit_collection = hit_collection
+    end
+
+    # @return [String]
+    def to_s
+      inspect
+    end
+
+    # @return [String]
+    def inspect
+      "<#{self.class}:#{format('%#.14x', object_id << 1)} "\
+      "@text=\"#{@hit_collection&.text}\" "\
+      "@fetched=\"#{!@fetch.nil?}\" "\
+      "@fullIdentifier=\"#{@fetch&.shortref(nil)}\" "\
+      "@title=\"#{@hit[:code]}\">"
+    end
+
+    # @return [String]
+    def to_xml(**opts)
+      fetch.to_xml **opts
+    end
+  end
+end

data/lib/relaton_bib/hit_collection.rb

@@ -0,0 +1,34 @@
+module RelatonBib
+  class HitCollection < Array
+    # @return [TrueClass, FalseClass]
+    attr_reader :fetched
+
+    # @return [String]
+    attr_reader :text
+
+    # @return [String]
+    attr_reader :year
+
+    # @return [RelatonIso::HitCollection]
+    def fetch
+      workers = WorkersPool.new 4
+      workers.worker(&:fetch)
+      each do |hit|
+        workers << hit
+      end
+      workers.end
+      workers.result
+      @fetched = true
+      self
+    end
+
+    def to_s
+      inspect
+    end
+
+    # @return [String]
+    def inspect
+      "<#{self.class}:#{format('%#.14x', object_id << 1)} @fetched=#{@fetched}>"
+    end
+  end
+end

data/lib/relaton_bib/localized_string.rb

@@ -3,6 +3,8 @@
 module RelatonBib
   # Localized string.
   class LocalizedString
+    include RelatonBib
+
     # @return [Array<String>] language Iso639 code
     attr_reader :language
 
@@ -42,9 +44,11 @@ module RelatonBib
 
     # @return [Hash]
     def to_hash
-      hash = { content: content }
-      hash[:language] = language if language&.any?
-      hash[:script] = script if script&.any?
+      return content unless language || script
+
+      hash = { "content" => content }
+      hash["language"] = single_element_array(language) if language&.any?
+      hash["script"] = single_element_array(script) if script&.any?
       hash
     end
   end

data/lib/relaton_bib/medium.rb

@@ -24,9 +24,9 @@ module RelatonBib
     # @return [Hash]
     def to_hash
       hash = {}
-      hash[:form] = form if form
-      hash[:size] = size if size
-      hash[:scale] = scale if scale
+      hash["form"] = form if form
+      hash["size"] = size if size
+      hash["scale"] = scale if scale
       hash
     end
   end

data/lib/relaton_bib/organization.rb

@@ -37,7 +37,7 @@ module RelatonBib
 
     # @return [Hash]
     def to_hash
-      { type: type, id: value }
+      { "type" => type, "id" => value }
     end
   end
 
@@ -55,15 +55,9 @@ module RelatonBib
     # @return [Array<RelatonBib::OrgIdentifier>]
     attr_reader :identifier
 
-    def hash2locstr(name)
-      name.is_a?(Hash) ?
-        LocalizedString.new(name[:content], name[:language], name[:script]) : 
-        LocalizedString.new(name)
-    end
-
     # @param name [String, Hash, Array<String, Hash>]
-    # @param abbreviation [RelatoBib::LocalizedStrig, String]
-    # @param subdivision [RelatoBib::LocalizedStrig, String]
+    # @param abbreviation [RelatoBib::LocalizedString, String]
+    # @param subdivision [RelatoBib::LocalizedString, String]
     # @param url [String]
     # @param identifier [Array<RelatonBib::OrgIdentifier>]
     # @param contact [Array<RelatonBib::Address, RelatonBib::Contact>]
@@ -73,24 +67,14 @@ module RelatonBib
       super(url: args[:url], contact: args.fetch(:contact, []))
 
       @name = if args[:name].is_a?(Array)
-                args[:name].map { |n| hash2locstr(n) }
+                args[:name].map { |n| localized_string(n) }
               else
-                [hash2locstr(args[:name])]
+                [localized_string(args[:name])]
               end
 
-      @abbreviation = if args[:abbreviation].is_a?(String)
-                        LocalizedString.new(args[:abbreviation])
-                      else
-                        args[:abbreviation]
-                      end
-
-      @subdivision  = if args[:subdivision].is_a?(String)
-                        LocalizedString.new(args[:subdivision])
-                      else
-                        args[:subdivision]
-                      end
-
-      @identifier  = args.fetch(:identifier, [])
+      @abbreviation = localized_string args[:abbreviation]
+      @subdivision  = localized_string args[:subdivision]
+      @identifier   = args.fetch(:identifier, [])
     end
 
     # @param builder [Nokogiri::XML::Builder]
@@ -109,11 +93,23 @@ module RelatonBib
 
     # @return [Hash]
     def to_hash
-      hash = { name: name.map(&:to_hash) }
-      hash[:abbreviation] = abbreviation.to_hash if abbreviation
-      hash[:identifier] = identifier.map(&:to_hash) if identifier&.any?
-      hash[:subdivision] = subdivision.to_hash if subdivision
-      { organization: hash.merge(super) }
+      hash = { "name" => single_element_array(name) }
+      hash["abbreviation"] = abbreviation.to_hash if abbreviation
+      hash["identifier"] = single_element_array(identifier) if identifier&.any?
+      hash["subdivision"] = subdivision.to_hash if subdivision
+      { "organization" => hash.merge(super) }
+    end
+
+    private
+
+    # @param arg [String, Hash, RelatoBib::LocalizedString]
+    # @return [RelatoBib::LocalizedString]
+    def localized_string(arg)
+      if arg.is_a?(String) then LocalizedString.new(arg)
+      elsif arg.is_a?(Hash)
+        LocalizedString.new(arg[:content], arg[:language], arg[:script])
+      elsif arg.is_a? LocalizedString then arg
+      end
     end
   end
 end

data/lib/relaton_bib/person.rb

@@ -5,6 +5,8 @@ require "relaton_bib/contributor"
 module RelatonBib
   # Person's full name
   class FullName
+    include RelatonBib
+
     # @return [Array<RelatonBib::LocalizedString>]
     attr_accessor :forename
 
@@ -60,22 +62,13 @@ module RelatonBib
     # @return [Hash]
     def to_hash
       hash = {}
-      hash[:forename] = forename.map(&:to_hash) if forename&.any?
-      hash[:initial] = initial.map(&:to_hash) if initial&.any?
-      hash[:surname] = surname.to_hash if surname
-      hash[:addition] = addition.map(&:to_hash) if addition&.any?
-      hash[:prefix] = prefix.map(&:to_hash) if prefix&.any?
-      hash[:completename] = completename.to_hash if completename
+      hash["forename"] = single_element_array(forename) if forename&.any?
+      hash["initial"] = single_element_array(initial) if initial&.any?
+      hash["surname"] = surname.to_hash if surname
+      hash["addition"] = single_element_array(addition) if addition&.any?
+      hash["prefix"] = single_element_array(prefix) if prefix&.any?
+      hash["completename"] = completename.to_hash if completename
       hash
-      # instance_variables.reduce({}) do |hash, var|
-      #   val = instance_variable_get var
-      #   if val || val.is_a?(Array) && val.any?
-      #     key = var.to_s.sub("@", "").to_sym
-      #     hash.merge key => val
-      #   else
-      #     hash
-      #   end
-      # end
     end
   end
 
@@ -118,7 +111,7 @@ module RelatonBib
 
     # @return [Hash]
     def to_hash
-      { type: type, id: value }
+      { "type" => type, "id" => value }
     end
   end
 
@@ -156,10 +149,10 @@ module RelatonBib
 
     # @return [Hash]
     def to_hash
-      hash = { name: name.to_hash }
-      hash[:affiliation] = affiliation.map(&:to_hash) if affiliation&.any?
-      hash[:identifier] = identifier.map(&:to_hash) if identifier&.any?
-      { person: hash.merge(super) }
+      hash = { "name" => name.to_hash }
+      hash["affiliation"] = single_element_array(affiliation) if affiliation&.any?
+      hash["identifier"] = single_element_array(identifier) if identifier&.any?
+      { "person" => hash.merge(super) }
     end
   end
 end

data/lib/relaton_bib/series.rb

@@ -97,16 +97,16 @@ module RelatonBib
     # @return [Hash]
     def to_hash
       hash = {}
-      hash[:type] = type if type
-      hash[:formattedref] = formattedref.to_hash if formattedref
-      hash[:title] = title.to_hash if title
-      hash[:place] = place if place
-      hash[:organization] = organization if organization
-      hash[:abbreviation] = abbreviation.to_hash if abbreviation
-      hash[:from] = from if from
-      hash[:to] = to if to
-      hash[:number] = number if number
-      hash[:partnumber] = partnumber if partnumber
+      hash["type"] = type if type
+      hash["formattedref"] = formattedref.to_hash if formattedref
+      hash["title"] = title.to_hash if title
+      hash["place"] = place if place
+      hash["organization"] = organization if organization
+      hash["abbreviation"] = abbreviation.to_hash if abbreviation
+      hash["from"] = from if from
+      hash["to"] = to if to
+      hash["number"] = number if number
+      hash["partnumber"] = partnumber if partnumber
       hash
     end
   end

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]
@@ -22,7 +22,7 @@ module RelatonBib
 
     # @return [Hash]
     def to_hash
-      { type: type, content: content.to_s }
+      { "type" => type, "content" => content.to_s }
     end
   end
 end

data/lib/relaton_bib/validity.rb

@@ -32,9 +32,9 @@ module RelatonBib
     # @return [Hash]
     def to_hash
       hash = {}
-      hash[:begins] = begins.strftime(FORMAT) if begins
-      hash[:ends] = ends.strftime(FORMAT) if ends
-      hash[:revision] = revision.strftime(FORMAT) if revision
+      hash["begins"] = begins.strftime(FORMAT) if begins
+      hash["ends"] = ends.strftime(FORMAT) if ends
+      hash["revision"] = revision.strftime(FORMAT) if revision
       hash
     end
   end

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "0.3.4".freeze
+  VERSION = "0.3.9".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

data/relaton-bib.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = "RelatonBib: Ruby XMLDOC impementation."
   spec.description   = "RelatonBib: Ruby XMLDOC impementation."
-  spec.homepage      = "https://github.com/metanorma/relaton-item"
+  spec.homepage      = "https://github.com/relaton/relaton-item"
   spec.license       = "BSD-2-Clause"
 
   # Specify which files should be added to the gem when it is released.
@@ -33,5 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "byebug"
 
   spec.add_dependency "addressable"
-  spec.add_dependency "nokogiri", "~> 1.10"
+  spec.add_dependency "nokogiri"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2019-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,16 +140,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 description: 'RelatonBib: Ruby XMLDOC impementation.'
 email:
 - open.source@ribose.com
@@ -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
@@ -188,6 +189,8 @@ files:
 - lib/relaton_bib/formatted_string.rb
 - lib/relaton_bib/hash_converter.rb
 - lib/relaton_bib/hash_to_bib.rb
+- lib/relaton_bib/hit.rb
+- lib/relaton_bib/hit_collection.rb
 - lib/relaton_bib/localized_string.rb
 - lib/relaton_bib/medium.rb
 - lib/relaton_bib/organization.rb
@@ -200,7 +203,7 @@ files:
 - lib/relaton_bib/workers_pool.rb
 - lib/relaton_bib/xml_parser.rb
 - relaton-bib.gemspec
-homepage: https://github.com/metanorma/relaton-item
+homepage: https://github.com/relaton/relaton-item
 licenses:
 - BSD-2-Clause
 metadata: {}