relaton-nist 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2eafbe4c1cb7719d3f782f77547db4b759bd8c41
-  data.tar.gz: 912039be62b33bdf6fab94966614e5de7adea3ac
+  metadata.gz: faceada8e94976b665bdb8599df2fc9889412bd9
+  data.tar.gz: e75e31cb091a6f1f9bfdb06ce801861a7f2f435c
 SHA512:
-  metadata.gz: e49aaf8910c7fc910da3f7581fd4f6dcc3fb9beb0dba9575ca266d4bc5edf2d9a0b013470308553c9a30f563aad84c5c7ae9d85ccbc4715bc8480e7bcb27ccc4
-  data.tar.gz: 84105c9c7612a47a9f3d6bebd873434147fa5a8e9ba0bedcc8ff0961939902eaf087fd3d08682eb2e45cbec10c262afabb4c5ec364d4f0e44262a061a6507048
+  metadata.gz: bddc62ce9bd2499c1fd88db7a1bb6457fdaa4e754165756cab7b019ba85106b3e5ff7bb51e11650416a7aa59f891fe6a5d73bde4de966e68d879db3e1d4b0beb
+  data.tar.gz: 9bafb3ad3192317101ce3b6ee0b8b5a463f82c5d3b4d8727a94d835bb3fb8db287acb04cbc42ed2ad6f4eebe77f896d12d04278fe9049efd35ae752c24202171

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton-nist (0.3.2)
+    relaton-nist (0.3.3)
       relaton-bib (~> 0.3.0)
       rubyzip
 
@@ -35,7 +35,7 @@ GEM
       pry (~> 0.10)
     public_suffix (3.1.1)
     rake (10.5.0)
-    relaton-bib (0.3.4)
+    relaton-bib (0.3.5)
       addressable
       nokogiri (~> 1.10)
     rspec (3.8.0)

data/lib/relaton_nist/comment_period.rb

@@ -26,5 +26,13 @@ module RelatonNist
         builder.extended extended.to_s if extended
       end
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = { "from" => from.to_s }
+      hash["to"] = to.to_s if to
+      hash["extended"] = extended.to_s if extended
+      hash
+    end
   end
 end

data/lib/relaton_nist/keyword.rb

@@ -1,5 +1,7 @@
 module RelatonNist
   class Keyword
+    include RelatonBib
+
     # @return [Nokogiri::XML::DocumentFragment]
     attr_reader :element
 
@@ -12,5 +14,10 @@ module RelatonNist
     def to_xml(builder)
       builder.keyword element.to_xml
     end
+
+    # @return [String]
+    def to_hash
+      element.text
+    end
   end
 end

data/lib/relaton_nist/nist_bibliographic_item.rb

@@ -6,7 +6,7 @@ module RelatonNist
     # @return [Array<RelatonNist::Keyword>]
     attr_reader :keyword
 
-    # @return [RelatonNist::CommentPeriod]
+    # @return [RelatonNist::CommentPeriod, NilClass]
     attr_reader :commentperiod
 
     # @param id [String, NilClass]
@@ -31,7 +31,7 @@ module RelatonNist
     # @param fetched [Date, NilClass] default nil
     # @param doctype [String]
     # @param keyword [Array<RelatonNist::Keyword>]
-    # @param commentperiod [RelatonNist::CommentPeriod]
+    # @param commentperiod [RelatonNist::CommentPeriod, NilClass]
     #
     # @param date [Array<Hash>]
     # @option date [String] :type
@@ -74,5 +74,13 @@ module RelatonNist
         end
       end
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = super
+      hash["keyword"] = single_element_array(keyword) if keyword&.any?
+      hash["commentperiod"] = commentperiod.to_hash if commentperiod
+      hash
+    end
   end
 end

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "0.3.2".freeze
+  VERSION = "0.3.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler