relaton-w3c 1.0.0 → 1.3.0

data/lib/relaton_w3c/hash_converter.rb

@@ -1,4 +1,11 @@
 module RelatonW3c
   class HashConverter < RelatonBib::HashConverter
+    class << self
+      # @param item_hash [Hash]
+      # @return [RelatonW3c::W3cBibliographicItem]
+      def bib_item(item_hash)
+        W3cBibliographicItem.new item_hash
+      end
+    end
   end
 end

data/lib/relaton_w3c/hit_collection.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "fileutils"
+require "yaml"
+
 module RelatonW3c
   # Page of hit collection.
   class HitCollection < RelatonBib::HitCollection

data/lib/relaton_w3c/scrapper.rb

@@ -44,7 +44,7 @@ module RelatonW3c
           titles << { content: title, type: "main" }
           subtitle = doc.at("//h2[@id='subtitle']").text
           titles << { content: subtitle, tipe: "subtitle" }
-        else
+        elsif hit["title"]
           titles << { content: hit["title"], type: "main" }
         end
         titles.map do |t|
@@ -166,7 +166,7 @@ module RelatonW3c
 
         hit = { "link" => link }
         item = parse_page hit
-        [RelatonBib::DocumentRelation.new(type: "obsoleted", bibitem: item)]
+        [RelatonBib::DocumentRelation.new(type: "obsoletedBy", bibitem: item)]
       end
 
       # @param doc [Nokogiri::HTML::Document]

data/lib/relaton_w3c/version.rb

@@ -1,3 +1,3 @@
 module RelatonW3c
-  VERSION = "1.0.0".freeze
+  VERSION = "1.3.0".freeze
 end

data/lib/relaton_w3c/w3c_bibliographic_item.rb

@@ -5,35 +5,12 @@ module RelatonW3c
       proposedRecommendation recommendation retired workingDraft
     ].freeze
 
-    attr_reader :doctype
-
     # @param doctype [String]
     def initialize(**args)
       if args[:doctype] && !TYPES.include?(args[:doctype])
         warn "[relaton-w3c] invalid document type: #{args[:doctype]}"
       end
-      @doctype = args.delete :doctype
       super **args
     end
-
-    # @param builder [Nokogiri::XML::Builder, NilClass]
-    # @param opts [Hash]
-    # @option opts [TrueClass, FalseClass, NilClass] bibdata
-    def to_xml(builder = nil, **opts)
-      super builder, **opts do |b|
-        if opts[:bibdata] && doctype
-          b.ext do |e|
-            e.doctype doctype if doctype
-          end
-        end
-      end
-    end
-
-    # @return [Hash]
-    def to_hash
-      hash = super
-      hash["doctype"] = doctype if doctype
-      hash
-    end
   end
 end

data/lib/relaton_w3c/w3c_bibliography.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "net/http"
+
 module RelatonW3c
   # Class methods for search W3C standards.
   class W3cBibliography
@@ -10,7 +12,7 @@ module RelatonW3c
         HitCollection.new text
       rescue SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET,
              EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
-             Net::ProtocolError, OpenSSL::SSL::SSLError, Errno::ETIMEDOUT
+             Net::ProtocolError, Errno::ETIMEDOUT
         raise RelatonBib::RequestError,
               "Could not access #{HitCollection::DOMAIN}"
       end

data/lib/relaton_w3c/xml_parser.rb

@@ -1,19 +1,6 @@
 module RelatonW3c
   class XMLParser < RelatonBib::XMLParser
     class << self
-      # @param xml [String]
-      # @return [RelatonW3c::W3cBibliographicItem, NilClass]
-      def from_xml(xml)
-        doc = Nokogiri::XML xml
-        doc.remove_namespaces!
-        item = doc.at("/bibitem|/bibdata")
-        if item
-          W3cBibliographicItem.new(item_data(item))
-        else
-          warn "[relaton-w3c] can't find bibitem or bibdata element in the XML"
-        end
-      end
-
       private
 
       # Override RelatonBib::XMLParser.item_data method.
@@ -27,6 +14,12 @@ module RelatonW3c
         data[:doctype] = ext.at("./doctype")&.text
         data
       end
+
+      # @param item_hash [Hash]
+      # @return [RelatonBib::BibliographicItem]
+      def bib_item(item_hash)
+        W3cBibliographicItem.new item_hash
+      end
     end
   end
 end

data/relaton_w3c.gemspec

@@ -9,9 +9,9 @@ Gem::Specification.new do |spec|
   spec.email         = ["open.source@ribose.com"]
 
   spec.summary       = "RelatonIso: retrieve W3C Standards for bibliographic "\
-                       "use using the IsoBibliographicItem model"
+                       "using the IsoBibliographicItem model"
   spec.description   = "RelatonIso: retrieve W3C Standards for bibliographic "\
-                       "use using the IsoBibliographicItem model"
+                       "using the IsoBibliographicItem model"
   spec.homepage      = "https://github.com/relaton/relaton-wc3"
   spec.license       = "BSD-2-Clause"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
@@ -39,5 +39,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-bib", ">= 1.0.0"
+  spec.add_dependency "relaton-bib", ">= 1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-w3c
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-25 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -114,15 +114,15 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
-description: 'RelatonIso: retrieve W3C Standards for bibliographic use using the IsoBibliographicItem
+        version: 1.3.0
+description: 'RelatonIso: retrieve W3C Standards for bibliographic using the IsoBibliographicItem
   model'
 email:
 - open.source@ribose.com
@@ -144,6 +144,8 @@ files:
 - bin/console
 - bin/rspec
 - bin/setup
+- grammars/basicdoc.rng
+- grammars/biblio.rng
 - lib/relaton_w3c.rb
 - lib/relaton_w3c/hash_converter.rb
 - lib/relaton_w3c/hit.rb
@@ -178,6 +180,6 @@ requirements: []
 rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
-summary: 'RelatonIso: retrieve W3C Standards for bibliographic use using the IsoBibliographicItem
+summary: 'RelatonIso: retrieve W3C Standards for bibliographic using the IsoBibliographicItem
   model'
 test_files: []