relaton-cie 1.13.0 → 1.14.0

data/lib/relaton_cie/data_fetcher.rb

@@ -78,7 +78,7 @@ module RelatonCie
         on = ref.at("p/time")
         date = [RelatonBib::BibliographicDate.new(type: "published", on: on[:datetime])]
         link = [RelatonBib::TypedUri.new(type: "src", content: url)]
-        bibitem = RelatonBib::BibliographicItem.new docid: docid, title: title, link: link, date: date
+        bibitem = BibliographicItem.new docid: docid, title: title, link: link, date: date
         type = ref.at('//li/i[contains(@class,"historical")]') ? "updates" : "updatedBy"
         { type: type, bibitem: bibitem }
       end
@@ -103,14 +103,14 @@ module RelatonCie
     # @param doc [Mechanize::Page]
     # @return [Array<Hash>]
     def fetch_contributor(doc) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity
-      authors = doc.xpath('//hgroup/p[not(@class="pub_date")]').text
+      authors = doc.xpath('//hgroup/p[not(@class="pub_date")]').text.gsub "\"", ""
       contribs = []
       until authors.empty?
         /^(?<sname1>\S+(?:\sder?\s)?[^\s,]+)
         (?:,?\s(?<sname2>[\w-]{2,})(?=,\s+\w\.))?
         (?:,?\s(?<fname>[\w-]{2,})(?!,\s+\w\.))?
         (?:(?:\s?,\s?|\s)(?<init>(?:\w(?:\s?\.|\s|,|$)[\s-]?)+))?
-        (?:(?:,\s?|\s|\.|(?<=\s))(?:and\s)?)?/x =~ authors
+        (?:(?:,\s*|\s+|\.|(?<=\s))(?:and\s)?)?/x =~ authors
         raise StandardError, "Author name not found in \"#{authors}\"" unless $LAST_MATCH_INFO
 
         authors.sub! $LAST_MATCH_INFO.to_s, ""
@@ -131,7 +131,7 @@ module RelatonCie
       contribs << { entity: org, role: [{ type: "publisher" }] }
     end
 
-    # @param bib [RelatonItu::ItuBibliographicItem]
+    # @param bib [RelatonCie::BibliographicItem]
     def write_file(bib)
       id = bib.docidentifier[0].id.gsub(%r{[/\s\-:.]}, "_")
       file = "#{@output}/#{id.upcase}.#{@format}"
@@ -148,8 +148,8 @@ module RelatonCie
     def parse_page(hit) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
       url = "https://www.techstreet.com#{hit.at('h3/a')[:href]}"
       doc = time_req { @agent.get url }
-      item = RelatonBib::BibliographicItem.new(
-        type: "standard", link: fetch_link(url), fetched: Date.today.to_s,
+      item = BibliographicItem.new(
+        type: "standard", link: fetch_link(url),
         docid: fetch_docid(hit, doc), title: fetch_title(doc),
         abstract: fetch_abstract(doc), date: fetch_date(doc),
         edition: fetch_edition(doc), contributor: fetch_contributor(doc),
@@ -182,7 +182,7 @@ module RelatonCie
       t1 = Time.now
       puts "Started at: #{t1}"
 
-      FileUtils.mkdir output unless Dir.exist? output
+      FileUtils.mkdir output
       new(output, format).fetch URL
 
       t2 = Time.now

data/lib/relaton_cie/hash_converter.rb

@@ -0,0 +1,11 @@
+module RelatonCie
+  class HashConverter < RelatonBib::HashConverter
+    class << self
+      # @param item_hash [Hash]
+      # @return [RelatonCie::BibliographicItem]
+      def bib_item(item_hash)
+        BibliographicItem.new(**item_hash)
+      end
+    end
+  end
+end

data/lib/relaton_cie/processor.rb

@@ -13,7 +13,7 @@ module RelatonCie
     # @param code [String]
     # @param date [String, NilClass] year
     # @param opts [Hash]
-    # @return [RelatonBib::BibliographicItem]
+    # @return [RelatonCie::BibliographicItem]
     def get(code, date, opts)
       ::RelatonCie::CieBibliography.get(code, date, opts)
     end
@@ -31,21 +31,21 @@ module RelatonCie
     end
 
     # @param xml [String]
-    # @return [RelatonBib::BibliographicItem]
+    # @return [RelatonCie::BibliographicItem]
     def from_xml(xml)
-      ::RelatonBib::XMLParser.from_xml xml
+      ::RelatonCie::XMLParser.from_xml xml
     end
 
     # @param hash [Hash]
-    # @return [RelatonBib::BibliographicItem]
+    # @return [RelatonCie::BibliographicItem]
     def hash_to_bib(hash)
-      ::RelatonBib::BibliographicItem.from_hash hash
+      ::RelatonCie::BibliographicItem.from_hash hash
     end
 
     # Returns hash of XML grammar
     # @return [String]
     def grammar_hash
-      @grammar_hash ||= ::RelatonEcma.grammar_hash
+      @grammar_hash ||= ::RelatonCie.grammar_hash
     end
   end
 end

data/lib/relaton_cie/scrapper.rb

@@ -4,7 +4,7 @@ module RelatonCie
 
     class << self
       # @param code [String]
-      # @return [RelatonBib::BibliographicItem]
+      # @return [RelatonCie::BibliographicItem]
       def scrape_page(code)
         url = "#{ENDPOINT}#{code.gsub(/[\/\s\-:.]/, '_').upcase}.yaml"
         parse_page url
@@ -17,11 +17,12 @@ module RelatonCie
       private
 
       # @param url [String]
-      # @retrurn [RelatonBib::BibliographicItem]
+      # @retrurn [RelatoCie::BibliographicItem]
       def parse_page(url)
         doc = OpenURI.open_uri url
         bib_hash = RelatonBib::HashConverter.hash_to_bib YAML.safe_load(doc)
-        RelatonBib::BibliographicItem.new(**bib_hash)
+        bib_hash[:fetched] = Date.today.to_s
+        RelatonCie::BibliographicItem.new(**bib_hash)
       end
     end
   end

data/lib/relaton_cie/version.rb

@@ -1,3 +1,3 @@
 module RelatonCie
-  VERSION = "1.13.0".freeze
+  VERSION = "1.14.0".freeze
 end

data/lib/relaton_cie/xml_parser.rb

@@ -0,0 +1,13 @@
+module RelatonCie
+  class XMLParser < RelatonBib::XMLParser
+    class << self
+      private
+
+      # @param item_hash [Hash]
+      # @return [RelatonCie::BibliographicItem]
+      def bib_item(item_hash)
+        BibliographicItem.new(**item_hash)
+      end
+    end
+  end
+end

data/lib/relaton_cie.rb

@@ -2,9 +2,12 @@ require "nokogiri"
 require "open-uri"
 require "relaton_bib"
 require "relaton_cie/version"
+require "relaton_cie/bibliographic_item"
 require "relaton_cie/cie_bibliography"
 require "relaton_cie/scrapper"
 require "relaton_cie/data_fetcher"
+require "relaton_cie/xml_parser"
+require "relaton_cie/hash_converter"
 
 module RelatonCie
   # Returns hash of XML reammar

data/relaton_cie.gemspec

@@ -37,5 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "mechanize", "~> 2.8.0"
-  spec.add_dependency "relaton-bib", "~> 1.13.0"
+  spec.add_dependency "relaton-bib", "~> 1.14.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cie
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-21 00:00:00.000000000 Z
+date: 2022-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.14.0
 description: "RelatonEcma: retrieve CIE Standards for bibliographic use \nusing the
   BibliographicItem model.\n"
 email:
@@ -131,6 +131,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -142,15 +143,19 @@ files:
 - bin/rspec
 - bin/setup
 - grammars/basicdoc.rng
+- grammars/biblio-standoc.rng
 - grammars/biblio.rng
-- grammars/isodoc.rng
-- grammars/reqt.rng
+- grammars/relaton-cie-compile.rng
+- grammars/relaton-cie.rng
 - lib/relaton_cie.rb
+- lib/relaton_cie/bibliographic_item.rb
 - lib/relaton_cie/cie_bibliography.rb
 - lib/relaton_cie/data_fetcher.rb
+- lib/relaton_cie/hash_converter.rb
 - lib/relaton_cie/processor.rb
 - lib/relaton_cie/scrapper.rb
 - lib/relaton_cie/version.rb
+- lib/relaton_cie/xml_parser.rb
 - relaton_cie.gemspec
 homepage: https://github.com/metanorma/relaton-cie
 licenses: