relaton-iso-bib 1.3.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9f99c30bfb243452c65a6d360870fdee10666c5943523fbfb9fa3a4621b74cf
-  data.tar.gz: 6b89f2abf535eca4eb2f2228825e4c4e35ee43c837898d549f68abe37859dc92
+  metadata.gz: 2c68549409829242a2a921485889aaceee2715cad247ba79ed700eb4d1f1bb11
+  data.tar.gz: 21b511a6eda29e11e72229481e942b3c57313b9ac6d825c3248320ae27f7bed8
 SHA512:
-  metadata.gz: 7b06406809884e1059d4dbf7e58875bb052e6d9ed1abe1f6ee58036b224f336cc662d6ba7d9ee6359d4216c80ca504803116b1ad848c1fc544d12483b6b790ae
-  data.tar.gz: 7f93851f6f71d1d37871b3735aa6033e1c8ea5711d2246258cf91a7161c587f6d16168d4d3111168fce7f29d76ec654f113eaa55477bf3cf5c88ec81fa7e6978
+  metadata.gz: 766dcc2b4b7ee5960c1eabed334c8e0308173eafbe5a5c7af58a0fcf397e5269c810aac6c95c6a99ff17a5c1edfcae155ace47ddd529539a5f1bcd20ff616162
+  data.tar.gz: 0bcc9f6ef345a2b5d26e999b954c28a2e930eb4804a730f34a24523b15f46a269d6c25c0ab649eaf93c42026fa8dbbe42b7e0f33f9d96bccf3cadb356b74c467

data/.github/workflows/macos.yml

@@ -26,6 +26,8 @@ jobs:
       - name: Update gems
         run: |
           sudo gem install bundler --force
+          ruby -v | grep 2.5 && bundle config set build.debase --with-cflags="-Wno-error=implicit-function-declaration"
+          ruby -v | grep 2.5 && bundle config set build.ruby-debug-ide --with-cflags="-Wno-error=implicit-function-declaration"
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |

data/README.adoc

@@ -40,11 +40,14 @@ item = RelatonIsoBib::IsoBibliographicItem.new(
     ),
     docnumber: "123456",
     title: [
-      { title_intro: "Geographic information", title_main: "Metadata",
-        title_part: "Part 1: Fundamentals", language: "en", script: "Latn" },
-      { title_intro: "Information géographique", title_main: "Métadonnées",
-        title_part: "Information géographique", language: "fr",
-        script: "Latn" },
+      { type: "title-intro", content: "Metadata", language: "en", script: "Latn" },
+      { type: "title-main", content: "Geographic information", language: "en", script: "Latn" },
+      { type: "title-part", content: "Part 1: Fundamentals", language: "en", script: "Latn" },
+      { type: "main", content: "Metadata - Geographic information - Part 1: Fundamentals", language: "en", script: "Latn" },
+      { type: "title-intro", content: "Métadonnées", language: "fr", script: "Latn" },
+      { type: "title-main", content: "Information géographique", language: "fr", script: "Latn" },
+      { type: "title-part", content: "Partie 1: Principes de base", language: "fr", script: "Latn" },
+      { type: "main", content: "Information géographique - Métadonnées - Partie 1: Principes de base", language: "fr", script: "Latn" },
     ],
     edition: "1",
     version: RelatonBib::BibliographicItem::Version.new("2019-04-01", ["draft"]),
@@ -52,7 +55,7 @@ item = RelatonIsoBib::IsoBibliographicItem.new(
     script: ["Latn"],
     type: "international-standard",
     docstatus: RelatonBib::DocumentStatus.new(stage: "60", substage: "60"),
-    dates: [{ type: "published", on: "2014-04" }],
+    date: [{ type: "published", on: "2014-04" }],
     abstract: [
       { content: "ISO 19115-1:2014 defines the schema required for ...",
         language: "en", script: "Latn", format: "text/plain" },
@@ -62,20 +65,21 @@ item = RelatonIsoBib::IsoBibliographicItem.new(
     contributor: [
       { entity: { name: "International Organization for Standardization",
                   url: "www.iso.org", abbreviation: "ISO" },
-        role: ["publisher"] },
+        role: [type: "publisher"] },
       {
         entity: RelatonBib::Person.new(
           name: RelatonBib::FullName.new(
             completename: RelatonBib::LocalizedString.new("John Smith"),
           ),
         ),
-        role: ["author"],
+        role: [type: "author"],
       },
     ],
-    copyright: { owner: {
-      name: "International Organization for Standardization",
-      abbreviation: "ISO", url: "www.iso.org"
-    }, from: "2014" },
+    copyright: [{
+      owner: [{
+        name: "International Organization for Standardization",
+        abbreviation: "ISO", url: "www.iso.org"
+      }], from: "2014" }],
     link: [
       { type: "src", content: "https://www.iso.org/standard/53798.html" },
       { type: "obp",
@@ -90,7 +94,7 @@ item = RelatonIsoBib::IsoBibliographicItem.new(
           formattedref: RelatonBib::FormattedRef.new(content: "ISO 19115:2003"),
           docstatus: RelatonBib::DocumentStatus.new(stage: "60", substage: "60"),
         ),
-        bib_locality: [
+        locality: [
           RelatonBib::BibItemLocality.new("updates", "Reference form"),
         ],
       ),
@@ -105,7 +109,7 @@ item = RelatonIsoBib::IsoBibliographicItem.new(
     series: [
       RelatonBib::Series.new(
         type: "main",
-        title: RelatonIsoBib::TypedTitleString.new(
+        title: RelatonBib::TypedTitleString.new(
           type: "title-main", content: "ISO/IEC FDIS 10118-3", language: "en", script: "Latn",
         ),
         place: "Serie's place",
@@ -133,7 +137,7 @@ item = RelatonIsoBib::IsoBibliographicItem.new(
       ),
     ],
     accesslocation: ["accesslocation1", "accesslocation2"],
-    classification: RelatonBib::Classification.new(type: "type", value: "value"),
+    classification: [RelatonBib::Classification.new(type: "type", value: "value")],
     validity: RelatonBib::Validity.new(
       begins: Time.new(2010, 10, 10, 12, 21),
       ends: Time.new(2011, 2, 3, 18,30),
@@ -156,9 +160,9 @@ item = RelatonIsoBib::IsoBibliographicItem.new(
     ics: [{ field: 35, group: 240, subgroup: 70 }],
   )
 
-=> #<RelatonIsoBib::IsoBibliographicItem:0x007fe5198c4370
+=> #<RelatonIsoBib::IsoBibliographicItem:0x007fc0b88c66a0
  @abstract=
-  [#<RelatonBib::FormattedString:0x007fe5198bcaa8 @content="ISO 19115-1:2014 defines the schema required for ...", @format="text/plain", @language=["en"], @script=["Latn"]>,
+  [#<RelatonBib::FormattedString:0x007fc0b88c5ae8 @content="ISO 19115-1:2014 defines the schema required for ...", @format="text/plain", @language=["en"], @script=["Latn"]>,
   ...
 ----
 
@@ -167,50 +171,44 @@ item = RelatonIsoBib::IsoBibliographicItem.new(
 [source,ruby]
 ----
 item.title
-=> [#<RelatonIsoBib::TypedTitleString:0x007fe5198ad4e0
-  @title=#<RelatonBib::FormattedString:0x007fe5198acd10 @content="Metadata", @format="text/plain", @language=["en"], @script=["Latn"]>,
-  @type="title-main">,
- #<RelatonIsoBib::TypedTitleString:0x007fe5198ac590
-  @title=#<RelatonBib::FormattedString:0x007fe5198a7ab8 @content="Geographic information", @format="text/plain", @language=["en"], @script=["Latn"]>,
+=> [#<RelatonBib::TypedTitleString:0x007fc08e95a640
+  @title=#<RelatonBib::FormattedString:0x007fc08e95a500 @content="Metadata", @format="text/plain", @language=["en"], @script=["Latn"]>,
   @type="title-intro">,
- #<RelatonIsoBib::TypedTitleString:0x007fe5198a6f00
-  @title=#<RelatonBib::FormattedString:0x007fe5198a6578 @content="Part 1: Fundamentals", @format="text/plain", @language=["en"], @script=["Latn"]>,
+ #<RelatonBib::TypedTitleString:0x007fc08e95a460
+  @title=#<RelatonBib::FormattedString:0x007fc08e95a320 @content="Geographic information", @format="text/plain", @language=["en"], @script=["Latn"]>,
+  @type="title-main">,
+ #<RelatonBib::TypedTitleString:0x007fc08e95a280
+  @title=#<RelatonBib::FormattedString:0x007fc08e95a140 @content="Part 1: Fundamentals", @format="text/plain", @language=["en"], @script=["Latn"]>,
   @type="title-part">,
- #<RelatonIsoBib::TypedTitleString:0x007fe5198a5d08
-  @title=
-   #<RelatonBib::FormattedString:0x007fe5198a5268 @content="Metadata - Geographic information - Part 1: Fundamentals", @format="text/plain", @language=["en"], @script=["Latn"]>,
+ #<RelatonBib::TypedTitleString:0x007fc08e95a0a0
+  @title=#<RelatonBib::FormattedString:0x007fc08e959f60 @content="Metadata - Geographic information - Part 1: Fundamentals", @format="text/plain", @language=["en"], @script=["Latn"]>,
   @type="main">,
- #<RelatonIsoBib::TypedTitleString:0x007fe5198a4980
-  @title=#<RelatonBib::FormattedString:0x007fe51989edf0 @content="Métadonnées", @format="text/plain", @language=["fr"], @script=["Latn"]>,
-  @type="title-main">,
- #<RelatonIsoBib::TypedTitleString:0x007fe51989d1a8
-  @title=#<RelatonBib::FormattedString:0x007fe51989cca8 @content="Information géographique", @format="text/plain", @language=["fr"], @script=["Latn"]>,
+ #<RelatonBib::TypedTitleString:0x007fc08e959ec0
+  @title=#<RelatonBib::FormattedString:0x007fc08e959d80 @content="Métadonnées", @format="text/plain", @language=["fr"], @script=["Latn"]>,
   @type="title-intro">,
- #<RelatonIsoBib::TypedTitleString:0x007fe51989c960
-  @title=#<RelatonBib::FormattedString:0x007fe519897d20 @content="Information géographique", @format="text/plain", @language=["fr"], @script=["Latn"]>,
+ #<RelatonBib::TypedTitleString:0x007fc08e959ce0
+  @title=#<RelatonBib::FormattedString:0x007fc08e959ba0 @content="Information géographique", @format="text/plain", @language=["fr"], @script=["Latn"]>,
+  @type="title-main">,
+ #<RelatonBib::TypedTitleString:0x007fc08e959b00
+  @title=#<RelatonBib::FormattedString:0x007fc08e9599c0 @content="Partie 1: Principes de base", @format="text/plain", @language=["fr"], @script=["Latn"]>,
   @type="title-part">,
- #<RelatonIsoBib::TypedTitleString:0x007fe519896088
+ #<RelatonBib::TypedTitleString:0x007fc08e959920
   @title=
-   #<RelatonBib::FormattedString:0x007fe519895b88
-    @content="Métadonnées - Information géographique - Information géographique",
-    @format="text/plain",
-    @language=["fr"],
-    @script=["Latn"]>,
+   #<RelatonBib::FormattedString:0x007fc08e9597e0 @content="Information géographique - Métadonnées - Partie 1: Principes de base", @format="text/plain", @language=["fr"], @script=["Latn"]>,
   @type="main">]
 
 item.title(lang: "en")
-=> [#<RelatonIsoBib::TypedTitleString:0x007fe5198ad4e0
-  @title=#<RelatonBib::FormattedString:0x007fe5198acd10 @content="Metadata", @format="text/plain", @language=["en"], @script=["Latn"]>,
-  @type="title-main">,
- #<RelatonIsoBib::TypedTitleString:0x007fe5198ac590
-  @title=#<RelatonBib::FormattedString:0x007fe5198a7ab8 @content="Geographic information", @format="text/plain", @language=["en"], @script=["Latn"]>,
+=> [#<RelatonBib::TypedTitleString:0x007fc08e95a640
+  @title=#<RelatonBib::FormattedString:0x007fc08e95a500 @content="Metadata", @format="text/plain", @language=["en"], @script=["Latn"]>,
   @type="title-intro">,
- #<RelatonIsoBib::TypedTitleString:0x007fe5198a6f00
-  @title=#<RelatonBib::FormattedString:0x007fe5198a6578 @content="Part 1: Fundamentals", @format="text/plain", @language=["en"], @script=["Latn"]>,
+ #<RelatonBib::TypedTitleString:0x007fc08e95a460
+  @title=#<RelatonBib::FormattedString:0x007fc08e95a320 @content="Geographic information", @format="text/plain", @language=["en"], @script=["Latn"]>,
+  @type="title-main">,
+ #<RelatonBib::TypedTitleString:0x007fc08e95a280
+  @title=#<RelatonBib::FormattedString:0x007fc08e95a140 @content="Part 1: Fundamentals", @format="text/plain", @language=["en"], @script=["Latn"]>,
   @type="title-part">,
- #<RelatonIsoBib::TypedTitleString:0x007fe5198a5d08
-  @title=
-   #<RelatonBib::FormattedString:0x007fe5198a5268 @content="Metadata - Geographic information - Part 1: Fundamentals", @format="text/plain", @language=["en"], @script=["Latn"]>,
+ #<RelatonBib::TypedTitleString:0x007fc08e95a0a0
+  @title=#<RelatonBib::FormattedString:0x007fc08e959f60 @content="Metadata - Geographic information - Part 1: Fundamentals", @format="text/plain", @language=["en"], @script=["Latn"]>,
   @type="main">]
 
 item.abstract(lang: "en").to_s
@@ -222,7 +220,7 @@ item.abstract(lang: "en").to_s
 [source,ruby]
 ----
 item.shortref(item.structuredidentifier)
-=> "ISO1-2-2014:2014"
+=> "ISO1-2-2014"
 ----
 
 === IsoBibliographicItem URLs
@@ -259,11 +257,11 @@ item.ics
 
 [source,ruby]
 ----
-item.dates
-=> [<RelatonIsoBib::BibliographicDate:0x007fd1d92e33c8 @on=2014-01-04 00:00:00 +0100, @type="published">]
+item.date
+=> [#<RelatonBib::BibliographicDate:0x007fc0aeb88438 @from=nil, @on=#<Date: 2014-04-01 ((2456749j,0s,0n),+0s,2299161j)>, @to=nil, @type="published">]
 
-item.dates.filter(type: "published").first.on
-=> 2014-01-04 00:00:00 +0100
+item.date.filter(type: "published").first.on
+=> #<Date: 2014-04-01 ((2456749j,0s,0n),+0s,2299161j)>
 ----
 
 === IsoBibliographicItem DocumentStatus
@@ -271,7 +269,10 @@ item.dates.filter(type: "published").first.on
 [source,ruby]
 ----
 item.status
-=> #<RelatonBib::DocumentStatus:0x007fe5198d7808 @iteration=nil, @stage="60", @substage="60">
+=> #<RelatonBib::DocumentStatus:0x007fc0aeb927d0
+ @iteration=nil,
+ @stage=#<RelatonBib::DocumentStatus::Stage:0x007fc0aeb92708 @abbreviation=nil, @value="60">,
+ @substage=#<RelatonBib::DocumentStatus::Stage:0x007fc0aeb92690 @abbreviation=nil, @value="60">>
 ----
 
 [source,ruby]
@@ -289,10 +290,11 @@ wg = item.editorialgroup
 [source,ruby]
 ----
 item.relation
-=> [#<RelatonBib::DocumentRelation:0x007fe5198cec80
-  @bib_locality=[#<RelatonBib::BibItemLocality:0x007fe5198cef78 @reference_from="Reference form", @reference_to=nil, @type="updates">],
-  @bibitem=
-   #<RelatonIsoBib::IsoBibliographicItem:0x007fe5198d4ae0
+=> #<RelatonBib::DocRelationCollection:0x007fc0aeb819f8
+ @array=
+  [#<RelatonBib::DocumentRelation:0x007fc0aeb90610
+    @bibitem=
+     #<RelatonIsoBib::IsoBibliographicItem:0x007fc0aeb91330
   ...
 ----
 
@@ -305,54 +307,52 @@ which strips the part number and part title of the original, and its abstract. T
 
 [source,ruby]
 ----
-item.to_all_parts
-=> true
-
-item.title(lang: "en")
-=> [#<RelatonIsoBib::TypedTitleString:0x007fe5198ad4e0
-  @title=#<RelatonBib::FormattedString:0x007fe5198acd10 @content="Metadata", @format="text/plain", @language=["en"], @script=["Latn"]>,
-  @type="title-main">,
- #<RelatonIsoBib::TypedTitleString:0x007fe5198ac590
-  @title=#<RelatonBib::FormattedString:0x007fe5198a7ab8 @content="Geographic information", @format="text/plain", @language=["en"], @script=["Latn"]>,
+all_parts_item = item.to_all_parts
+=> #<RelatonIsoBib::IsoBibliographicItem:0x007fc0aec00960
+ @abstract=[],
+ @accesslocation=["accesslocation1", "accesslocation2"],
+ @all_parts=true,
+ ...
+
+all_arts_item.title(lang: "en")
+=> [#<RelatonBib::TypedTitleString:0x007fc08f388dd8
+  @title=#<RelatonBib::FormattedString:0x007fc08f388d10 @content="Metadata", @format="text/plain", @language=["en"], @script=["Latn"]>,
   @type="title-intro">,
- #<RelatonIsoBib::TypedTitleString:0x007fe5198a5d08
-  @title=
-   #<RelatonBib::FormattedString:0x007fe5198a5268 @content="Metadata - Geographic information - Part 1: Fundamentals", @format="text/plain", @language=["en"], @script=["Latn"]>,
+ #<RelatonBib::TypedTitleString:0x007fc08f388b58
+  @title=#<RelatonBib::FormattedString:0x007fc08f388b08 @content="Geographic information", @format="text/plain", @language=["en"], @script=["Latn"]>,
+  @type="title-main">,
+ #<RelatonBib::TypedTitleString:0x007fc08f3888d8
+  @title=#<RelatonBib::FormattedString:0x007fc08f388888 @content="Metadata – Geographic information", @format="text/plain", @language=["en"], @script=["Latn"]>,
   @type="main">]
 
-item.shortref(item.structuredidentifier)
-=> "ISO1-2014(allparts):2014: All Parts"
+all_arts_item.shortref(item.structuredidentifier)
+=> "ISO1(allparts):2014: All Parts"
 
-item.relation.last.bibitem.title
-=> [#<RelatonIsoBib::TypedTitleString:0x007fe51b293620
-  @title=#<RelatonBib::FormattedString:0x007fe51b293530 @content="Metadata", @format="text/plain", @language=["en"], @script=["Latn"]>,
-  @type="title-main">,
- #<RelatonIsoBib::TypedTitleString:0x007fe51b293350
-  @title=#<RelatonBib::FormattedString:0x007fe51b293288 @content="Geographic information", @format="text/plain", @language=["en"], @script=["Latn"]>,
+all_arts_item.relation.last.bibitem.title
+=> [#<RelatonBib::TypedTitleString:0x007fc0aeb7bd28
+  @title=#<RelatonBib::FormattedString:0x007fc0aeb7bad0 @content="Metadata", @format="text/plain", @language=["en"], @script=["Latn"]>,
   @type="title-intro">,
- #<RelatonIsoBib::TypedTitleString:0x007fe51b293120
-  @title=#<RelatonBib::FormattedString:0x007fe51b293080 @content="Part 1: Fundamentals", @format="text/plain", @language=["en"], @script=["Latn"]>,
+ #<RelatonBib::TypedTitleString:0x007fc0aeb7ba30
+  @title=#<RelatonBib::FormattedString:0x007fc0aeb7b8c8 @content="Geographic information", @format="text/plain", @language=["en"], @script=["Latn"]>,
+  @type="title-main">,
+ #<RelatonBib::TypedTitleString:0x007fc0aeb7b800
+  @title=#<RelatonBib::FormattedString:0x007fc0aeb7b5f8 @content="Part 1: Fundamentals", @format="text/plain", @language=["en"], @script=["Latn"]>,
   @type="title-part">,
- #<RelatonIsoBib::TypedTitleString:0x007fe51b292f68
-  @title=
-   #<RelatonBib::FormattedString:0x007fe51b292ea0 @content="Metadata - Geographic information - Part 1: Fundamentals", @format="text/plain", @language=["en"], @script=["Latn"]>,
+ #<RelatonBib::TypedTitleString:0x007fc0aeb7b558
+  @title=#<RelatonBib::FormattedString:0x007fc0aeb7b288 @content="Metadata - Geographic information - Part 1: Fundamentals", @format="text/plain", @language=["en"], @script=["Latn"]>,
   @type="main">,
- #<RelatonIsoBib::TypedTitleString:0x007fe51b292d60
-  @title=#<RelatonBib::FormattedString:0x007fe51b292cc0 @content="Métadonnées", @format="text/plain", @language=["fr"], @script=["Latn"]>,
-  @type="title-main">,
- #<RelatonIsoBib::TypedTitleString:0x007fe51b292b58
-  @title=#<RelatonBib::FormattedString:0x007fe51b292ab8 @content="Information géographique", @format="text/plain", @language=["fr"], @script=["Latn"]>,
+ #<RelatonBib::TypedTitleString:0x007fc0aeb7b148
+  @title=#<RelatonBib::FormattedString:0x007fc0aeb7ae00 @content="Métadonnées", @format="text/plain", @language=["fr"], @script=["Latn"]>,
   @type="title-intro">,
- #<RelatonIsoBib::TypedTitleString:0x007fe51b2929a0
-  @title=#<RelatonBib::FormattedString:0x007fe51b292900 @content="Information géographique", @format="text/plain", @language=["fr"], @script=["Latn"]>,
+ #<RelatonBib::TypedTitleString:0x007fc0aeb7ac48
+  @title=#<RelatonBib::FormattedString:0x007fc0aeb7a888 @content="Information géographique", @format="text/plain", @language=["fr"], @script=["Latn"]>,
+  @type="title-main">,
+ #<RelatonBib::TypedTitleString:0x007fc0aeb7a6d0
+  @title=#<RelatonBib::FormattedString:0x007fc0aeb7a400 @content="Partie 1: Principes de base", @format="text/plain", @language=["fr"], @script=["Latn"]>,
   @type="title-part">,
- #<RelatonIsoBib::TypedTitleString:0x007fe51b2927c0
+ #<RelatonBib::TypedTitleString:0x007fc0aeb7a2c0
   @title=
-   #<RelatonBib::FormattedString:0x007fe51b292720
-    @content="Métadonnées - Information géographique - Information géographique",
-    @format="text/plain",
-    @language=["fr"],
-    @script=["Latn"]>,
+   #<RelatonBib::FormattedString:0x007fc0aeb79f28 @content="Information géographique - Métadonnées - Partie 1: Principes de base", @format="text/plain", @language=["fr"], @script=["Latn"]>,
   @type="main">]
 ----
 
@@ -367,14 +367,14 @@ which strips the date of publication of the original, and its abstract. The oper
 
 [source,ruby]
 ----
-item.dates
-=> [#<RelatonBib::BibliographicDate:0x007fe5198beba0 @from=nil, @on=2014-04-01 00:00:00 +0200, @to=nil, @type="published">]
+all_parts_item.date
+=> [#<RelatonBib::BibliographicDate:0x007fc0aeb88438 @from=nil, @on=#<Date: 2014-04-01 ((2456749j,0s,0n),+0s,2299161j)>, @to=nil, @type="published">]
 
-item.to_most_recent_reference
-item.dates
+most_recent_ref_item = all_parts_item.to_most_recent_reference
+most_recent_ref_item.date
 => []
 
-item.shortref(item.structuredidentifier)
+most_recent_ref_item.shortref(most_recent_ref_item.structuredidentifier)
 => "ISO1(allparts): All Parts"
 ----
 
@@ -390,120 +390,7 @@ item.to_xml(bibdata: true)
   <title type="title-intro" format="text/plain" language="en" script="Latn">Geographic information</title>
   <title type="title-part" format="text/plain" language="en" script="Latn">Part 1: Fundamentals</title>
   <title type="main" format="text/plain" language="en" script="Latn">Metadata - Geographic information - Part 1: Fundamentals</title>
-  <title type="title-main" format="text/plain" language="fr" script="Latn">Métadonnées</title>
-  <title type="title-intro" format="text/plain" language="fr" script="Latn">Information géographique</title>
-  <title type="title-part" format="text/plain" language="fr" script="Latn">Information géographique</title>
-  <title type="main" format="text/plain" language="fr" script="Latn">Métadonnées - Information géographique - Information géographique</title>
-  <uri type="src">https://www.iso.org/standard/53798.html</uri>
-  <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:53798:en</uri>
-  <uri type="rss">https://www.iso.org/contents/data/standard/05/37/53798.detail.rss</uri>
-  <docnumber>123456</docnumber>
-  <date type="published">
-    <on>2014</on>
-  </date>
-  <contributor>
-    <role type="publisher"/>
-    <organization>
-      <name>International Organization for Standardization</name>
-      <abbreviation>ISO</abbreviation>
-      <uri>www.iso.org</uri>
-    </organization>
-  </contributor>
-  <contributor>
-    <role type="author"/>
-    <person>
-      <name>
-        <completename>John Smith</completename>
-      </name>
-    </person>
-  </contributor>
-  <edition>1</edition>
-  <version>
-    <revision_date>2019-04-01</revision_date>
-    <draft>draft</draft>
-  </version>
-  <language>en</language>
-  <language>fr</language>
-  <script>Latn</script>
-  <abstract format="text/plain" language="en" script="Latn">ISO 19115-1:2014 defines the schema required for ...</abstract>
-  <abstract format="text/plain" language="fr" script="Latn">L'ISO 19115-1:2014 définit le schéma requis pour ...</abstract>
-  <status>
-    <stage>60</stage>
-    <substage>60</substage>
-  </status>
-  <copyright>
-    <from>2014</from>
-    <owner>
-      <organization>
-        <name>International Organization for Standardization</name>
-        <abbreviation>ISO</abbreviation>
-        <uri>www.iso.org</uri>
-      </organization>
-    </owner>
-  </copyright>
-  <relation type="updates">
-    <bibitem>
-      <formattedref>ISO 19115:2003</formattedref>
-      <status>
-        <stage>60</stage>
-        <substage>60</substage>
-      </status>
-    </bibitem>
-    <locality type="updates">
-      <referenceFrom>Reference form</referenceFrom>
-    </locality>
-  </relation>
-  <relation type="updates">
-    <bibitem>
-      <formattedref>ISO 19115:2003/Cor 1:2006</formattedref>
-    </bibitem>
-  </relation>
-  <series type="main">
-    <title type="title-main" language="en" script="Latn">ISO/IEC FDIS 10118-3</title>
-    <place>Serie's place</place>
-    <organization>Serie's organization</organization>
-    <abbreviation language="en" script="Latn">ABVR</abbreviation>
-    <from>2009-02-01</from>
-    <to>2010-12-20</to>
-    <number>serie1234</number>
-    <partnumber>part5678</partnumber>
-  </series>
-  <series type="alt">
-    <formattedref language="en" script="Latn">serieref</formattedref>
-  </series>
-  <medium>
-    <form>medium form</form>
-    <size>medium size</size>
-    <scale>medium scale</scale>
-  </medium>
-  <place>bib place</place>
-  <locality type="section">
-    <referenceFrom>Reference from</referenceFrom>
-    <referenceTo>Reference to</referenceTo>
-  </locality>
-  <accesslocation>accesslocation1</accesslocation>
-  <accesslocation>accesslocation2</accesslocation>
-  <classification type="type">value</classification>
-  <validity>
-    <validityBegins>2010-10-10 12:21</validityBegins>
-    <validityEnds>2011-02-03 18:30</validityEnds>
-    <validityRevision>2011-03-04 09:00</validityRevision>
-  </validity>
-  <ext>
-    <doctype>international-standard</doctype>
-    <editorialgroup>
-      <technical_committee number="211" type="technicalCommittee"> ISO/TC 211 Geographic information/Geomatics</technical_committee>
-      <subcommittee number="122" type="ISO">International Organization for Standardization</subcommittee>
-      <workgroup number="111" type="WG">Workgroup Organization</workgroup>
-    </editorialgroup>
-    <ics>
-      <code>35.240.70</code>
-      <text>IT applications in science</text>
-    </ics>
-    <structuredidentifier type="sid">
-      <project-number part="2" subpart="2">ISO 1-2:2014</project-number>
-    </structuredidentifier>
-  </ext>
+  ...
 </bibdata>"
 
 item.to_xml(bibdata: true, note: [{ type: "note type", text: "test note" }])
@@ -513,6 +400,47 @@ item.to_xml(bibdata: true, note: [{ type: "note type", text: "test note" }])
   ...
   <note format="text/plain" type="note type">test note</note>
   ...
+</bibdata>"
+----
+=== Export bibliographic item to BibTeX
+
+[source,ruby]
+----
+item.to_bibtex
+=> "@international-standard{john2014a,
+  tile = {Information géographique - Métadonnées - Partie 1: Principes de base},
+  edition = {1},
+  author = {Smith, John},
+  publisher = {International Organization for Standardization},
+  address = {bib place},
+  year = {2014},
+  month = apr,
+  type = {value},
+  timestamp = {2018-10-21},
+  url = {https://www.iso.org/standard/53798.html},
+  month_numeric = {4}
+}"
+----
+
+=== Exporting bibliographic item to AsciiBib
+
+[source,ruby]
+----
+item.to_asciibib
+=> "[%bibitem]
+== {blank}
+id:: ISOTC211
+fetched:: 2020-08-19
+title::
+title.type:: title-intro
+title.content:: Metadata
+title.language:: en
+title.script:: Latn
+title.format:: text/plain
+itle::
+title.type:: title-main
+title.conten:: Geographic information
+..."
 ----
 
 === Create bibliographic item form YAML

data/grammars/isodoc.rng

@@ -43,7 +43,9 @@
     <define name="xref">
       <element name="xref">
         <attribute name="target">
-          <data type="IDREF"/>
+          <data type="string">
+            <param name="pattern">\i\c*|\c+#\c+</param>
+          </data>
         </attribute>
         <optional>
           <attribute name="type">
@@ -61,6 +63,11 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="droploc">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -578,6 +585,8 @@
             <ref name="ol"/>
             <ref name="dl"/>
             <ref name="formula"/>
+            <ref name="quote"/>
+            <ref name="sourcecode"/>
           </choice>
         </oneOrMore>
       </element>
@@ -661,6 +670,16 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="valign">
+            <choice>
+              <value>top</value>
+              <value>middle</value>
+              <value>bottom</value>
+              <value>baseline</value>
+            </choice>
+          </attribute>
+        </optional>
         <choice>
           <zeroOrMore>
             <choice>
@@ -697,6 +716,16 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="valign">
+            <choice>
+              <value>top</value>
+              <value>middle</value>
+              <value>bottom</value>
+              <value>baseline</value>
+            </choice>
+          </attribute>
+        </optional>
         <choice>
           <zeroOrMore>
             <choice>
@@ -834,6 +863,13 @@
   </define>
   <define name="standard-document">
     <element name="standard-document">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <optional>
         <ref name="boilerplate"/>
@@ -855,7 +891,7 @@
       <oneOrMore>
         <choice>
           <ref name="content"/>
-          <ref name="preface_abstract"/>
+          <ref name="abstract"/>
           <ref name="foreword"/>
           <ref name="introduction"/>
           <ref name="acknowledgements"/>
@@ -922,6 +958,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -961,9 +1000,6 @@
   </define>
   <define name="content-subsection">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Content-Section"/>
     </element>
   </define>
@@ -992,6 +1028,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1011,9 +1050,6 @@
   </define>
   <define name="clause">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Clause-Section"/>
     </element>
   </define>
@@ -1042,18 +1078,24 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
     <group>
-      <group>
-        <zeroOrMore>
-          <ref name="BasicBlock"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="note"/>
-        </zeroOrMore>
-      </group>
+      <choice>
+        <group>
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="note"/>
+          </zeroOrMore>
+        </group>
+        <ref name="amend"/>
+      </choice>
       <zeroOrMore>
         <choice>
           <ref name="clause-subsection"/>
@@ -1180,6 +1222,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -1447,11 +1492,6 @@
       </optional>
     </element>
   </define>
-  <define name="preface_abstract">
-    <element name="abstract">
-      <ref name="Basic-Section"/>
-    </element>
-  </define>
   <define name="term-clause">
     <element name="clause">
       <optional>
@@ -1501,4 +1541,79 @@
       <ref name="CitationType"/>
     </element>
   </define>
+  <define name="amend">
+    <element name="amend">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <attribute name="change">
+        <choice>
+          <value>add</value>
+          <value>modify</value>
+          <value>delete</value>
+        </choice>
+      </attribute>
+      <optional>
+        <attribute name="path"/>
+      </optional>
+      <optional>
+        <attribute name="path_end"/>
+      </optional>
+      <optional>
+        <attribute name="title"/>
+      </optional>
+      <optional>
+        <element name="location">
+          <zeroOrMore>
+            <ref name="locality"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <zeroOrMore>
+        <ref name="autonumber"/>
+      </zeroOrMore>
+      <optional>
+        <element name="description">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="newcontent">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="description">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+    </element>
+  </define>
+  <define name="autonumber">
+    <element name="autonumber">
+      <attribute name="type">
+        <choice>
+          <value>requirement</value>
+          <value>recommendation</value>
+          <value>permission</value>
+          <value>table</value>
+          <value>figure</value>
+          <value>admonition</value>
+          <value>formula</value>
+          <value>sourcecode</value>
+          <value>example</value>
+          <value>note</value>
+        </choice>
+      </attribute>
+      <text/>
+    </element>
+  </define>
 </grammar>

data/grammars/isostandard.rng

@@ -253,7 +253,7 @@
     <define name="preface">
       <element name="preface">
         <optional>
-          <ref name="preface_abstract"/>
+          <ref name="abstract"/>
         </optional>
         <ref name="foreword"/>
         <optional>
@@ -405,6 +405,13 @@
   -->
   <define name="iso-standard">
     <element name="iso-standard">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/lib/relaton_iso_bib/editorial_group.rb

@@ -33,7 +33,7 @@ module RelatonIsoBib
     # @option workgroup [Integer] :number
     #
     # @param secretariat [String, NilClass]
-    def initialize(technical_committee:, **args) # rubocop:disable Metrics/CyclomaticComplexity
+    def initialize(technical_committee:, **args) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/AbcSize
       @technical_committee = technical_committee.map do |tc|
         tc.is_a?(Hash) ? IsoSubgroup.new(tc) : tc
       end
@@ -46,10 +46,13 @@ module RelatonIsoBib
       @secretariat = args[:secretariat]
     end
 
-    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    # @return [true]
+    def presence?
+      true
+    end
 
     # @param builder [Nokogiri::XML::Builder]
-    def to_xml(builder) # rubocop:disable Metrics/CyclomaticComplexity
+    def to_xml(builder) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/AbcSize, Metrics/MethodLength
       return unless technical_committee || subcommittee || workgroup ||
         secretariat
 
@@ -66,10 +69,9 @@ module RelatonIsoBib
         builder.secretariat secretariat if secretariat
       end
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     # @return [Hash]
-    def to_hash
+    def to_hash # rubocop:disable Metrics/AbcSize
       hash = {
         "technical_committee" => single_element_array(technical_committee),
       }

data/lib/relaton_iso_bib/iso_bibliographic_item.rb

@@ -126,24 +126,15 @@ module RelatonIsoBib
       check_doctype args[:doctype]
 
       super_args = args.select do |k|
-        %i[id docnumber language script docstatus date abstract contributor
-           edition version relation biblionote series medium place copyright
-           link fetched docid formattedref extent accesslocation classification
-           validity doctype keyword].include? k
+        %i[id title docnumber language script docstatus date abstract
+           contributor edition version relation biblionote series medium place
+           copyright link fetched docid formattedref extent accesslocation
+           classification validity doctype keyword].include? k
       end
       super super_args
 
       @type = args[:type] || "standard"
 
-      @title = args.fetch(:title, []).map do |t|
-        if t.is_a? Hash
-          # a + typed_titles(t)
-          RelatonBib::TypedTitleString.new t
-        else
-          t
-        end
-      end
-
       if args[:editorialgroup]
         @editorialgroup = if args[:editorialgroup].is_a?(Hash)
                             EditorialGroup.new(args[:editorialgroup])
@@ -158,16 +149,13 @@ module RelatonIsoBib
       @id_attribute = true
     end
 
-    # @return [String]
-    def to_xml(builder = nil, **opts)
-      if opts[:note]&.any?
-        opts.fetch(:note, []).each do |n|
-          @biblionote << RelatonBib::BiblioNote.new(
-            content: n[:text], type: n[:type], format: "text/plain"
-          )
-        end
-      end
-      super builder, **opts do |b|
+    # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] :builder XML builder
+    # @option opts [Boolean] :bibdata
+    # @option opts [String] :lang language
+    # @return [String] XML
+    def to_xml(**opts)
+      super **opts do |b|
         if opts[:bibdata] && (doctype || respond_to?(:committee) && committee ||
           editorialgroup || ics.any? || structuredidentifier || stagename ||
           block_given?)
@@ -218,7 +206,7 @@ module RelatonIsoBib
       end
     end
 
-    def makeid(id, attribute, _delim = "") # rubocop:disable Metrics/CyclomaticComplexity
+    def makeid(id, attribute, _delim = "") # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/AbcSize
       return nil if attribute && !@id_attribute
 
       id ||= @docidentifier.reject { |i| i&.type == "DOI" }[0]

data/lib/relaton_iso_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonIsoBib
-  VERSION = "1.3.0".freeze
+  VERSION = "1.6.0".freeze
 end

data/lib/relaton_iso_bib/xml_parser.rb

@@ -41,22 +41,10 @@ module RelatonIsoBib
         )
       end
 
-      # Override RelatonBib::XMLParser.ttitle method.
-      # @param title [Nokogiri::XML::Element]
-      # @return [RelatonBib::TypedTitleString]
-      def ttitle(title)
-        return unless title
-
-        RelatonBib::TypedTitleString.new(
-          type: title[:type], content: title.text, language: title[:language],
-          script: title[:script], format: title[:format]
-        )
-      end
-
       # @TODO Organization doesn't recreated
       # @param ext [Nokogiri::XML::Element]
       # @return [RelatonIsoBib::EditorialGroup]
-      def fetch_editorialgroup(ext) # rubocop:disable Metrics/CyclomaticComplexity
+      def fetch_editorialgroup(ext) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/AbcSize,Metrics/PerceivedComplexity
         eg = ext&.at("./editorialgroup")
         return unless eg
 

data/relaton_iso_bib.gemspec

@@ -36,5 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
 
   spec.add_dependency "isoics", "~> 0.1.6"
-  spec.add_dependency "relaton-bib", "~> 1.3.0"
+  spec.add_dependency "relaton-bib", "~> 1.6.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso-bib
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-20 00:00:00.000000000 Z
+date: 2020-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.6.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.6.pre
 description: 'RelatonIsoBib: Ruby ISOXMLDOC impementation.'
 email:
 - open.source@ribose.com
@@ -188,7 +188,7 @@ homepage: https://github.com/relaton/relaton-iso-bib
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -204,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: 'RelatonIsoBib: Ruby ISOXMLDOC impementation.'
 test_files: []