relaton-ietf 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1a02321969acca073a48c62ae75a320b3c522e7
-  data.tar.gz: 275620cf52c41de79ef4cfc5e7757e510320c52e
+  metadata.gz: 4cc103e987a5910cf81abcb428e531a3dcb745d5
+  data.tar.gz: ac31349aa191b80af09bc3eb662dffb74856213e
 SHA512:
-  metadata.gz: 104dad9c9bb3990c68d6a49391f623f99e1e8f20d173f6bbd914b9cff0767e3d91c4b9622f61e2504698d4501daf2c53c610a43fea76ca39c9cddae9c66aa4a8
-  data.tar.gz: 00d29c43e3320f587518408c040e90158477ff5cc3fbc719debe01f50f1d0d51e8af8d716b8c686627ace940e15a458b96353602c07ed8b494f16028197034d2
+  metadata.gz: ca721460f6c4c69d8e771750bd974be8723676a22851676c7545280f22776ffc90d601b1ff1587afe4a694c3543e003af7db710b5cb524a7bc4e1b038e83536e
+  data.tar.gz: 6df64a75bffbe763747846d9978d5b935aa75885606963dd1060820f7a436f0c5f64319a28545b9b8c513b7543beed62b7e2cb85f55c653ca337edb835a77881

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    relaton-ietf (0.6.0)
-      relaton-iso-bib (~> 0.3.0)
+    relaton-ietf (0.6.1)
+      relaton-bib (~> 0.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -21,7 +21,6 @@ GEM
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
     hashdiff (0.4.0)
-    isoics (0.1.7)
     json (2.2.0)
     method_source (0.9.2)
     mini_portile2 (2.4.0)
@@ -35,13 +34,9 @@ GEM
       pry (~> 0.10)
     public_suffix (3.1.1)
     rake (10.5.0)
-    relaton-bib (0.3.0)
+    relaton-bib (0.3.2)
       addressable
       nokogiri (~> 1.10)
-    relaton-iso-bib (0.3.0)
-      isoics (~> 0.1.6)
-      relaton-bib (~> 0.3.0)
-      ruby_deep_clone (~> 0.8.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -57,7 +52,6 @@ GEM
     rspec-support (3.8.2)
     ruby-debug-ide (0.7.0)
       rake (>= 0.8.1)
-    ruby_deep_clone (0.8.0)
     safe_yaml (1.0.5)
     simplecov (0.17.0)
       docile (~> 1.1)

data/README.adoc

@@ -128,6 +128,22 @@ item.to_xml bibdata: true
 ...
 ----
 
+=== Create bibliographic item form YAML
+[source,ruby]
+----
+hash = YAML.load_file 'spec/examples/ietf_bib_item.yml'
+=> {"id"=>"RFC 8341",
+...
+
+bib_hash = RelatonIetf::HashConverter.hash_to_bib hash
+=> {:id=>"RFC 8341",
+...
+
+RelatonIetf::IetfBibliographicItem.new bib_hash
+=> #<RelatonIetf::IetfBibliographicItem:0x007f9a929dde40
+...
+----
+
 == Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/metanorma/relaton-ietf.

data/lib/relaton_ietf.rb

@@ -4,6 +4,7 @@ require "relaton_ietf/version"
 require "relaton_ietf/ietf_bibliography"
 require "relaton_ietf/ietf_bibliographic_item"
 require "relaton_ietf/xml_parser"
+require "relaton_ietf/hash_converter"
 
 if defined? Relaton
   require_relative "relaton/processor"

data/lib/relaton_ietf/hash_converter.rb

@@ -0,0 +1,23 @@
+module RelatonIetf
+  class HashConverter < RelatonBib::HashConverter
+    class << self
+      # @override RelatonBib::HashConverter.hash_to_bib
+      # @param args [Hash]
+      # @param nested [TrueClass, FalseClass]
+      # @return [Hash]
+      # def hash_to_bib(args, nested = false)
+      #   ret = super
+      #   return if ret.nil?
+
+      #   doctype_hash_to_bib(ret)
+      #   ret
+      # end
+
+      # private
+
+      # def doctype_hash_to_bib(ret)
+      #   ret
+      # end
+    end
+  end
+end

data/lib/relaton_ietf/ietf_bibliographic_item.rb

@@ -4,13 +4,13 @@ module RelatonIetf
     attr_reader :doctype
 
     # @return [Array<String>]
-    attr_reader :keywords
+    attr_reader :keyword
 
     # @param doctype [String]
-    # @param keywords [Array<String>]
+    # @param keyword [Array<String>]
     def initialize(**args)
       @doctype = args.delete :doctype
-      @keywords = args.delete(:keywords) || []
+      @keyword = args.delete(:keyword) || []
       super
     end
 
@@ -23,7 +23,7 @@ module RelatonIetf
         if opts[:bibdata]
           b.ext do
             b.doctype doctype if doctype
-            keywords.each { |k| b.keyword k }
+            keyword.each { |k| b.keyword k }
           end
         end
       end

data/lib/relaton_ietf/scrapper.rb

@@ -54,7 +54,7 @@ module RelatonIetf
           contributor: contributors(reference),
           date: dates(reference),
           series: series(reference),
-          keywords: reference.xpath("front/keyword").map(&:text),
+          keyword: reference.xpath("front/keyword").map(&:text),
         )
       end
       # rubocop:enable Metrics/MethodLength
@@ -112,9 +112,9 @@ module RelatonIetf
         res.body
       end
 
-      def make_uri(uri_template, reference)
-        uri_template.gsub("CODE", reference)
-      end
+      # def make_uri(uri_template, reference)
+      #   uri_template.gsub("CODE", reference)
+      # end
 
       # @return [String]
       def language(reference)
@@ -160,7 +160,7 @@ module RelatonIetf
           next unless si[:stream]
 
           entity = RelatonBib::Organization.new name: si[:stream]
-          { entity: entity, role: ["author"] }
+          { entity: entity, role: [type: "author"] }
         end.compact
       end
 
@@ -226,9 +226,9 @@ module RelatonIetf
       end
 
       # @param author [Nokogiri::XML::Document]
-      # @return [String]
+      # @return [Hash]
       def contributor_role(author)
-        author[:role] || "author"
+        { type: author[:role] || "author" }
       end
 
       def month(mon)
@@ -260,7 +260,7 @@ module RelatonIetf
         id = (reference[:anchor] || reference[:docName]).sub(/^(RFC)/, "\\1 ")
         ret = []
         ret << RelatonBib::DocumentIdentifier.new(type: "IETF", id: id)
-        ret + reference.xpath("./seriesinfo").map do |si|
+        ret + reference.xpath("./seriesInfo").map do |si|
           next unless si[:name] == "DOI"
 
           RelatonBib::DocumentIdentifier.new(id: si[:value], type: si[:name])

data/lib/relaton_ietf/version.rb

@@ -1,3 +1,3 @@
 module RelatonIetf
-  VERSION = "0.6.0".freeze
+  VERSION = "0.6.1".freeze
 end

data/relaton_ietf.gemspec

@@ -40,5 +40,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-iso-bib", "~> 0.3.0"
+  spec.add_dependency "relaton-bib", "~> 0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ietf
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-24 00:00:00.000000000 Z
+date: 2019-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: relaton-iso-bib
+  name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -188,6 +188,7 @@ files:
 - lib/relaton/processor.rb
 - lib/relaton/provider_ietf.rb
 - lib/relaton_ietf.rb
+- lib/relaton_ietf/hash_converter.rb
 - lib/relaton_ietf/ietf_bibliographic_item.rb
 - lib/relaton_ietf/ietf_bibliography.rb
 - lib/relaton_ietf/scrapper.rb