relaton-bib 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4e9e77fcafd4d9937bc4076463c4b96cf7fffada
-  data.tar.gz: 5eff627669c4a456d41b15f85f898bfc3563310f
+SHA256:
+  metadata.gz: c666eff3590a39978b0d0e4547096284b8eedb28c9bb87d819491adc19ad3181
+  data.tar.gz: 9fe53d79fbca6cb27d0febfbb79981b8cee85ee1f4954db53664bc5f5769394d
 SHA512:
-  metadata.gz: 968fa8eae4a590a4fc392a9cde9c97059e5b07e692db31fbbc74d5c00f196b301d55df226261586587bad2d009a2cba55e1e170239508fbd2ce367f930c62f81
-  data.tar.gz: 96cfc0b51bb02bebcfcf5583ea2aa30ef02886bac7ae04a42b43e626c167a03518ba1289c0ecd5cd4c37d2cd1e359bdabf167d643299d101ca2eed774dcfe947
+  metadata.gz: e70371f853c3ab10c91cffea4a96453f9929b5979d5947541d8bea21116e236c7eb063968e72ead587af2f0fbd9e3c9a7489e4d83e5c729cbd6571b5ce1f4a2e
+  data.tar.gz: 96dc61bc07a449c64877fd94e86e9228259c084e5ddef22e4540133b4adc95321caeff297dff3aef3847df5213ffc17d9c874555d7ab13929c6a5e7c7c28abf2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton-bib (0.3.2)
+    relaton-bib (0.3.3)
       addressable
       nokogiri (~> 1.10)
 
@@ -11,7 +11,7 @@ GEM
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     byebug (11.0.1)
-    debase (0.2.2)
+    debase (0.2.3)
       debase-ruby_core_source (>= 0.10.2)
     debase-ruby_core_source (0.10.5)
     diff-lcs (1.3)
@@ -28,7 +28,7 @@ GEM
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.1)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
     rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -39,7 +39,7 @@ GEM
     rspec-support (3.8.2)
     ruby-debug-ide (0.7.0)
       rake (>= 0.8.1)
-    simplecov (0.16.1)
+    simplecov (0.17.0)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)

data/docs/hash.adoc

@@ -91,8 +91,8 @@ abstract:
     script: Latn
     format: text/plain
 # contributors are an array of entity/role pairs, where entity is either person or organization.
-# The role is an array; if there is a more complete description, that is given as the second element 
-# of an array, and is itself an array.
+# The role is an array of type and description; it can be a an array of just string, which are treated
+# as the type.
 # Organisations have attributes name, url, abbreviation, subdivision, contacts, identifiers
 # Persons have attributes name, affiliation, contacts
 # Person names have attributes surname, completename, initials, forename, additions, prefixes.
@@ -112,9 +112,8 @@ contributor:
       abbreviation: ISO
       subdivision: division
     role: 
-      - publisher
-      - 
-        - Publisher role
+      type: publisher
+      description: Publisher role
   - person:
       name:
         completename:
@@ -437,9 +436,8 @@ person::
   abbreviation::: ISO
   subdivision::: division
 role::
-  * publisher
-  * 
-  ** Publisher role
+  type::: publisher
+  description::: Publisher role
 
 ==== Contributor
 person::

data/lib/relaton_bib/hash_converter.rb

@@ -136,7 +136,9 @@ module RelatonBib
         ret[:contributor] = array(ret[:contributor])
         ret[:contributor]&.each_with_index do |c, i|
           roles = array(ret[:contributor][i][:role]).map do |r|
-            if r.is_a? Array
+            if r.is_a? Hash
+              { type: r[:type], description: array(r[:description]) }
+            elsif r.is_a? Array
               { type: r[0], description: r.fetch(1) }
             else
               { type: r }

data/lib/relaton_bib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 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-02 00:00:00.000000000 Z
+date: 2019-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: 'RelatonBib: Ruby XMLDOC impementation.'