relaton-bib 0.3.12 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9629f3a155e7b1e9ffd45fb5e4ecd369a7fa3068f7c635290b9757e52f437ad
-  data.tar.gz: 2e7592910a8563d3f4a231a9856a779a3c3d9ffc3a719030e3f1687413f82d85
+  metadata.gz: 1895db87e6e6d010858802f4ff11b7b948b0b0474bfc3eefbbce32e5f3dcd105
+  data.tar.gz: 20320ba0d5ccf314fe1d92225efde5e3162b9b0325878bfd1e3305a2c0a66416
 SHA512:
-  metadata.gz: b230bc556b2b9fcdffa2db61c3c2b715b7e4a1c8d368d584682bdcbc8e5208fedbe3727130238fd875970d1663b4bbd1a4b6e372797ce4fcacc5ec1f890f1edc
-  data.tar.gz: 5f54f308c4040424e26c8a96f44f8299394cd82fa37d145832828eb4eb7c5db05472a458504f584885ddb3c642a86a9563e537be990842dd08eede85a8c24d46
+  metadata.gz: fe2a6ec289e51ed504e3fd206b623ce81c57a942276070a505de3642b45705f3aea5dfb8f6aa6feaf2e7f3d460db1498c6871498c208043213a6154f7f375eb1
+  data.tar.gz: 1fc4a93c85b30c432750df1e6611a88eb2f3e9ecb701af1d7a149abb59c6d7ce999b89fbbb2374ea95f5ac47c93022d48bba3d9f65f7c6e860ef3be2062b48e1

data/.github/workflows/macos.yml

@@ -12,7 +12,9 @@ jobs:
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v1
+        with:
+          submodules: recursive
       - name: Use Ruby
         uses: actions/setup-ruby@v1
         with:

data/.github/workflows/ubuntu.yml

@@ -12,7 +12,9 @@ jobs:
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v1
+        with:
+          submodules: recursive
       - name: Use Ruby
         uses: actions/setup-ruby@v1
         with:

data/.github/workflows/windows.yml

@@ -12,7 +12,9 @@ jobs:
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v1
+        with:
+          submodules: recursive
       - name: Use Ruby
         uses: actions/setup-ruby@v1
         with:

data/.gitmodules

@@ -0,0 +1,6 @@
+[submodule "metanorma-model-iso"]
+	path = metanorma-model-iso
+	url = https://github.com/metanorma/metanorma-model-iso
+[submodule "relaton-models"]
+	path = relaton-models
+	url = https://github.com/relaton/relaton-models

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton-bib (0.3.12)
+    relaton-bib (0.4.0)
       addressable
       nokogiri
 
@@ -22,6 +22,7 @@ GEM
     mini_portile2 (2.4.0)
     nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
+    optout (0.0.2)
     public_suffix (4.0.1)
     rake (10.5.0)
     rspec (3.8.0)
@@ -39,6 +40,8 @@ GEM
     rspec-support (3.8.2)
     ruby-debug-ide (0.7.0)
       rake (>= 0.8.1)
+    ruby-jing (0.0.1)
+      optout (>= 0.0.2)
     simplecov (0.17.0)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -57,7 +60,8 @@ DEPENDENCIES
   relaton-bib!
   rspec (~> 3.0)
   ruby-debug-ide
+  ruby-jing
   simplecov
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

data/lib/relaton_bib/bib_item_locality.rb

@@ -37,10 +37,9 @@ module RelatonBib
 
     # @param builder [Nokogiri::XML::Builder]
     def to_xml(builder)
-      builder.locality(type: type) do
-        builder.referenceFrom reference_from # { reference_from.to_xml(builder) }
-        builder.referenceTo reference_to if reference_to
-      end
+      builder.parent[:type] = type
+      builder.referenceFrom reference_from # { reference_from.to_xml(builder) }
+      builder.referenceTo reference_to if reference_to
     end
 
     # @return [Hash]

data/lib/relaton_bib/bibliographic_item.rb

@@ -350,7 +350,7 @@ module RelatonBib
         series.each { |s| s.to_xml builder }
         medium&.to_xml builder
         place.each { |pl| builder.place pl }
-        extent.each { |e| e.to_xml builder }
+        extent.each { |e| builder.extent { e.to_xml builder } }
         accesslocation.each { |al| builder.accesslocation al }
         classification&.to_xml builder
         validity&.to_xml builder

data/lib/relaton_bib/contributor.rb

@@ -64,7 +64,8 @@ module RelatonBib
     # @return [String]
     attr_reader :value
 
-    # @param phone [String]
+    # @param type [String] allowed "phone", "email" or "uri"
+    # @param value [String]
     def initialize(type:, value:)
       @type  = type
       @value = value

data/lib/relaton_bib/document_relation.rb

@@ -45,7 +45,7 @@ module RelatonBib
       builder.relation(type: type) do
         bibitem.to_xml(builder, **opts.merge(embedded: true))
         bib_locality.each do |l|
-          l.to_xml builder
+          builder.locality { l.to_xml builder }
         end
       end
     end

data/lib/relaton_bib/person.rb

@@ -51,10 +51,10 @@ module RelatonBib
           builder.completename { completename.to_xml builder }
         else
           prefix.each { |p| builder.prefix { p.to_xml builder } } 
+          forename.each { |f| builder.forename { f.to_xml builder } }
           initial.each { |i| builder.initial { i.to_xml builder } }
-          addition.each { |a| builder.addition { a.to_xml builder } }
           builder.surname { surname.to_xml builder }
-          forename.each { |f| builder.forename { f.to_xml builder } }
+          addition.each { |a| builder.addition { a.to_xml builder } }
         end
       end
     end

data/lib/relaton_bib/validity.rb

@@ -25,7 +25,7 @@ module RelatonBib
       builder.validity do
         builder.validityBegins begins.strftime(FORMAT) if begins
         builder.validityEnds ends.strftime(FORMAT) if ends
-        builder.validityRevision revision.strftime(FORMAT) if revision
+        builder.revision revision.strftime(FORMAT) if revision
       end
     end
 

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "0.3.12".freeze
+  VERSION = "0.4.0".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -105,7 +105,7 @@ module RelatonBib
       end
 
       def fetch_extent(item)
-        item.xpath("./locality").map do |ex|
+        item.xpath("./extent").map do |ex|
           BibItemLocality.new(
             ex[:type], ex.at("referenceFrom")&.text, ex.at("referenceTo")&.text
           )
@@ -125,7 +125,7 @@ module RelatonBib
 
         begins = (b = vl.at("validityBegins")) ? Time.strptime(b.text, "%Y-%m-%d %H:%M") : nil
         ends = (e = vl.at("validityEnds")) ? Time.strptime(e.text, "%Y-%m-%d %H:%M") : nil
-        revision = (r = vl.at("validityRevision")) ? Time.strptime(r.text, "%Y-%m-%d %H:%M") : nil
+        revision = (r = vl.at("revision")) ? Time.strptime(r.text, "%Y-%m-%d %H:%M") : nil
         Validity.new begins: begins, ends: ends, revision: revision
       end
 

data/relaton-bib.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "ruby-debug-ide"
+  spec.add_development_dependency "ruby-jing"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "byebug"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.4.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-jing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +175,7 @@ files:
 - ".github/workflows/ubuntu.yml"
 - ".github/workflows/windows.yml"
 - ".gitignore"
+- ".gitmodules"
 - ".rspec"
 - ".rubocop.yml"
 - Gemfile