metanorma-standoc 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1453d5a4693d43ed4e32a5a97d1ac72760b055c961bf9977d50f6732ffcd6b7
-  data.tar.gz: ad33298dc46235a94b759bbdd07124f30f1f0b7a233a5e0e8675c3fa8b73f725
+  metadata.gz: 29ab7132a76a53ee303ac53204ca6ed7f3c7c08fbed11630735cd977c709b9d8
+  data.tar.gz: 39bfe93c825d14a28f480018a8d7b454dde14820560ae0e7afac68003bfe2bba
 SHA512:
-  metadata.gz: 786e9ede1e35e90a2d523c17dcb623b35d9a6039e20c2808cb176bf0a54f2cfa2e83026514f672bccb9771ab863214d9a6ed4275f6b388ac9d1f31ae26f85d49
-  data.tar.gz: 2ffc403caa148b2b2248bf33bbb12284dd7331781abc173a8e858b66a8a1a212e6f23e68b7c9156ccdbab0432387400f42191c0369c070d6b4f463efbfc028e9
+  metadata.gz: b9b36882ea7259d3fd618e1c1ed804f91d5ffa36503ee924f19e78e7ed52e67f1317fb47c0056705cb1e3542ff65fbd2e4c8871e9a1c503223c6cf34446a7895
+  data.tar.gz: b62285a6f373777087a57becc2a5a028a65f3f61e5d658daa6e93af61d078a15b239f5ff0da5498b3561457c4a7f664bb83e01e6ccc6d184c82de3b672828a85

data/lib/asciidoctor/standoc/converter.rb

@@ -1,5 +1,5 @@
 require "asciidoctor"
-require "asciidoctor/standoc/version"
+require "metanorma/standoc/version"
 require "asciidoctor/standoc/base"
 require "asciidoctor/standoc/front"
 require "asciidoctor/standoc/lists"

data/lib/asciidoctor/standoc/macros.rb

@@ -54,9 +54,10 @@ module Asciidoctor
 
       def self.generate_file parent, reader
         src = reader.source
-        reader.lines.first.sub(/\s+$/, "") != "@startuml" or
+        !reader.lines.first.sub(/\s+$/, "").match /^@startuml($| )/ or
           src = "@startuml\n#{src}\n@enduml\n"
-        filename = parent.document.reader.lineno
+        /^@startuml (?<filename>[^\n]+)\n/ =~ src
+        filename ||= parent.document.reader.lineno
         system "mkdir -p plantuml"
         File.open("plantuml/#{filename}.pml", "w") { |f| f.write src }
         system "plantuml plantuml/#{filename}.pml"

data/lib/asciidoctor/standoc/ref.rb

@@ -43,12 +43,17 @@ module Asciidoctor
         "#{id}:#{year}"
       end
 
+      def docid(t, code)
+        type, code_stripped = @bibdb&.docid_type(code)
+        t.docidentifier (code_stripped || code), **attr_code(type: type)
+      end
+
       def isorefmatches(xml, m)
         ref = fetch_ref xml, m[:code], m[:year]
         return use_my_anchor(ref, m[:anchor]) if ref
         xml.bibitem **attr_code(ref_attributes(m)) do |t|
           t.title(**plaintxt) { |i| i << ref_normalise(m[:text]) }
-          t.docidentifier id_and_year(m[:code], m[:year])
+          docid(t, id_and_year(m[:code], m[:year]))
           m[:year] and t.date **{ type: "published" } do |d|
             set_date_range(d, m[:year])
           end
@@ -61,7 +66,7 @@ module Asciidoctor
         return use_my_anchor(ref, m[:anchor]) if ref
         xml.bibitem **attr_code(ref_attributes(m)) do |t|
           t.title(**plaintxt) { |i| i << ref_normalise(m[:text]) }
-          t.docidentifier id_and_year(m[:code], "--")
+          docid(t, id_and_year(m[:code], "--"))
           t.date **{ type: "published" } do |d|
             d.on "--" 
           end
@@ -71,13 +76,13 @@ module Asciidoctor
       end
 
       def conditional_date(t, m, noyr)
-          m.names.include?("year") and
-            t.date(**{ type: "published" }) do |d|
-            if noyr then d.on "--"
-            else
-              set_date_range(d, m[:year])
-            end
+        m.names.include?("year") and !m[:year].nil? and
+          t.date(**{ type: "published" }) do |d|
+          if noyr then d.on "--"
+          else
+            set_date_range(d, m[:year])
           end
+        end
       end
 
       def isorefmatches3(xml, m)
@@ -87,7 +92,7 @@ module Asciidoctor
         return use_my_anchor(ref, m[:anchor]) if ref
         xml.bibitem(**attr_code(ref_attributes(m))) do |t|
           t.title(**plaintxt) { |i| i << ref_normalise(m[:text]) }
-          t.docidentifier(id_and_year(m[:code], m[:year]) + " (all parts)")
+          docid(t, id_and_year(m[:code], m[:year]) + " (all parts)")
           conditional_date(t, m, noyr)
           iso_publisher(t, m[:code])
           t.note(**plaintxt) { |p| p << "ISO DATE: #{m[:fn]}" } if m.names.include?("fn") && m[:fn]
@@ -109,7 +114,7 @@ module Asciidoctor
           t.formattedref **{ format: "application/x-isodoc+xml" } do |i|
             i << ref_normalise_no_format(m[:text])
           end
-          t.docidentifier(/^\d+$/.match(m[:code]) ? "[#{m[:code]}]" : m[:code])
+          docid(t, /^\d+$/.match(m[:code]) ? "[#{m[:code]}]" : m[:code])
         end
       end
 

data/lib/metanorma/standoc/processor.rb

@@ -18,7 +18,7 @@ module Metanorma
       end
 
       def version
-        "Asciidoctor::Standoc #{Metanorma::Standoc::VERSION}/IsoDoc #{IsoDoc::VERSION}"
+        "Metanorma::Standoc #{Metanorma::Standoc::VERSION}/IsoDoc #{IsoDoc::VERSION}"
       end
 
       def input_to_isodoc(file)

data/lib/{asciidoctor → metanorma}/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.0.4".freeze
+    VERSION = "1.0.5".freeze
   end
 end

data/lib/metanorma-standoc.rb

@@ -1,6 +1,6 @@
 require "asciidoctor" unless defined? Asciidoctor::Converter
 require_relative "asciidoctor/standoc/converter"
-require_relative "asciidoctor/standoc/version"
+require_relative "metanorma/standoc/version"
 require "asciidoctor/extensions"
 
 if defined? Metanorma

data/metanorma-standoc.gemspec

@@ -2,7 +2,7 @@
 
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "asciidoctor/standoc/version"
+require "metanorma/standoc/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "metanorma-standoc"
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ruby-jing"
   spec.add_dependency "isodoc", "~> 0.9.0"
   spec.add_dependency "iev", "~> 0.2.0"
-  spec.add_dependency "relaton", "~> 0.2.0"
+  spec.add_dependency "relaton", "~> 0.2.2"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug"
@@ -44,4 +44,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "metanorma", "~> 0.2.6"
   spec.add_development_dependency "isobib", "~> 0.3.0"
+  spec.add_development_dependency "ietfbib", "~> 0.3.0"
 end

data/spec/asciidoctor-standoc/macros_spec.rb

@@ -41,6 +41,17 @@ RSpec.describe Asciidoctor::Standoc do
       Alice -> Bob: Another authentication Request
       Alice <-- Bob: another authentication Response
       ....
+
+      [plantuml]
+      ....
+      @startuml filename
+      Alice -> Bob: Authentication Request
+      Bob --> Alice: Authentication Response
+
+      Alice -> Bob: Another authentication Request
+      Alice <-- Bob: another authentication Response
+      @enduml
+      ....
     INPUT
        #{BLANK_HDR}
        <sections><figure id="_">
@@ -48,7 +59,11 @@ RSpec.describe Asciidoctor::Standoc do
 </figure>
 <figure id="_">
   <image src="plantuml/29.png" id="_" imagetype="PNG" height="auto" width="auto"/>
-</figure></sections>
+</figure>
+<figure id="_">
+  <image src="plantuml/filename.png" id="_" imagetype="PNG" height="auto" width="auto"/>
+</figure>
+        </sections>
 
        </standard-document>
     OUTPUT

data/spec/asciidoctor-standoc/refs_spec.rb

@@ -1,5 +1,6 @@
 require "spec_helper"
 require "isobib"
+require "ietfbib"
 
 RSpec.describe Asciidoctor::Standoc do
     it "processes simple ISO reference" do
@@ -462,7 +463,7 @@ RSpec.describe Asciidoctor::Standoc do
         <title>Normative References</title>
         <bibitem id="iso123" type="standard">
         <title format="text/plain">Standard</title>
-        <docidentifier>ISO 123</docidentifier>
+        <docidentifier type="ISO">ISO 123</docidentifier>
         <contributor>
           <role type="publisher"/>
           <organization>
@@ -600,7 +601,7 @@ OUTPUT
 end
 
     def mock_rfcbib_get_rfc8341
-      expect(RfcBib::RfcBibliography).to receive(:get).with("RFC 8341", nil, {}) do
+      expect(IETFBib::RfcBibliography).to receive(:get).with("RFC 8341", nil, {}) do
         IsoBibItem.from_xml(<<~"OUTPUT")
       <bibitem id="RFC8341">
   <title format="text/plain" language="en" script="Latn">Network Configuration Access Control Model</title>

data/spec/metanorma/processor_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe Metanorma::Standoc::Processor do
   end
 
   it "registers version against metanorma" do
-    expect(processor.version.to_s).to match(%r{^Asciidoctor::Standoc })
+    expect(processor.version.to_s).to match(%r{^Metanorma::Standoc })
     expect(processor.version.to_s).to match(%r{/IsoDoc })
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2018-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +248,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: ietfbib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 description: |
   metanorma-standoc realises standards following the Metanorma standoc model
 
@@ -296,10 +310,10 @@ files:
 - lib/asciidoctor/standoc/utils.rb
 - lib/asciidoctor/standoc/validate.rb
 - lib/asciidoctor/standoc/validate_section.rb
-- lib/asciidoctor/standoc/version.rb
 - lib/metanorma-standoc.rb
 - lib/metanorma/standoc.rb
 - lib/metanorma/standoc/processor.rb
+- lib/metanorma/standoc/version.rb
 - metanorma-standoc.gemspec
 - spec/asciidoctor-standoc/base_spec.rb
 - spec/asciidoctor-standoc/blocks_spec.rb