relaton-bib 1.11.7 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dffbd3f78b2468d48d601dd2cb1fa883c94d16d0b6c16a213219f85bbeef4c3
-  data.tar.gz: b04d3b2db08c74e0ba9599c36a35ebd00dc62501ce0847bbce046cbcc9892fa8
+  metadata.gz: 9eeef3d918b1e4019c727d83fbd3dcaaec3b728b0e5ae20fc060d2f807766d9a
+  data.tar.gz: 52f1ef6b2878caf82fd057367c86c9559c9b40b28426ab707c195f8d986955fc
 SHA512:
-  metadata.gz: adf68e1aa4a1c7f8fc719cf51bfc1b74d0e8ae49374647d70140021d5250908c52b0728219cb5eda9aed442eaf3f12674648ac1e61af744ffce345d0e81c7b91
-  data.tar.gz: 29690620969a335e11ab867163f33b530072cea8ceaab4d2980c60eadf14c9eaddb2976c02826cdf13ad677dd2ef781539419a014929481bce0e90274cc6dad7
+  metadata.gz: 976fbcf860048645b33c83a02aa3d93371ec5b03a7e5282a263cbfeede3acc3b869c613edb642157abd14908ff665b63219ee374a8d5ccfc9c0a256b9e224fd7
+  data.tar.gz: 0fd3bc4e7e8177e84887d65c137add9566bbca0cc317b1b2423fffc37f60b280463e8f6c55b5e1aa67ebb4c4d01cc18e3c5786ff7ac9d9aaffa3e5a2664dc624

data/README.adoc

@@ -31,216 +31,16 @@ Or install it yourself as:
 
 [source,ruby]
 ----
-item = RelatonBib::BibliographicItem.new(
-  id: "ISOTC211", fetched: Date.today.to_s,
-  title: [
-    { type: "main", content: "Geographic information", language: "en", script: "Latn" },
-    {
-      content: "Information géographique", language: "fr", script: "Latn"
-    },
-  ],
-  type: "standard",
-  docid: [
-    RelatonBib::DocumentIdentifier.new(id: "TC211", type: "ISO"),
-    RelatonBib::DocumentIdentifier.new(id: "ISBN", type: "isbn"),
-    RelatonBib::DocumentIdentifier.new(id: "LCCN", type: "lccn"),
-    RelatonBib::DocumentIdentifier.new(id: "ISSN", type: "issn"),
-  ],
-  docnumber: "123456",
-  edition: "1", language: %w[en fr], script: ["Latn"],
-  version: RelatonBib::BibliographicItem::Version.new("2019-04-01", ["draft"]),
-  biblionote: [
-    RelatonBib::BiblioNote.new(content: "note"),
-    RelatonBib::BiblioNote.new(content: "An note", type: "annote"),
-    RelatonBib::BiblioNote.new(content: "How published", type: "howpublished"),
-    RelatonBib::BiblioNote.new(content: "Comment", type: "comment"),
-    RelatonBib::BiblioNote.new(content: "Table Of Contents", type: "tableOfContents"),
-  ],
-  docstatus: RelatonBib::DocumentStatus.new(
-    stage: "stage", substage: "substage", iteration: "final",
-  ),
-  date: [
-    { type: "issued", on: "2014" },
-    { type: "published", on: "2014-04" },
-    { type: "accessed", on: "2015-05-20" },
-  ],
-  abstract: [
-    { content: "ISO 19115-1:2014 defines the schema required for ...",
-      language: "en", script: "Latn", format: "text/plain" },
-    { content: "L'ISO 19115-1:2014 définit le schéma requis pour ...",
-      language: "fr", script: "Latn", format: "text/plain" },
-  ],
-  contributor: [
-    {
-      entity: {
-        name: "International Organization for Standardization",
-        url: "www.iso.org", abbreviation: "ISO", subdivision: "division",
-      },
-      role: [{ type: "publisher", description: ["Publisher role"] }],
-    },
-    {
-      entity: RelatonBib::Person.new(
-        name: RelatonBib::FullName.new(
-          completename: RelatonBib::LocalizedString.new("A. Bierman", "en"),
-        ),
-        affiliation: [RelatonBib::Affiliation.new(
-          organization: RelatonBib::Organization.new(
-            name: "IETF",
-            abbreviation: RelatonBib::LocalizedString.new("IETF"),
-            identifier: [RelatonBib::OrgIdentifier.new("uri", "www.ietf.org")],
-          )
-        )],
-        contact: [
-          RelatonBib::Address.new(
-            street: ["Street"], city: "City", postcode: "123456",
-            country: "Country", state: "State"
-          ),
-          RelatonBib::Contact.new(type: "phone", value: "223322"),
-        ]
-      ),
-      role: [type: "author"],
-    },
-    RelatonBib::ContributionInfo.new(
-      entity: RelatonBib::Organization.new(
-        name: "IETF",
-        abbreviation: "IETF",
-        identifier: [RelatonBib::OrgIdentifier.new("uri", "www.ietf.org")],
-      ),
-      role: [type: "publisher"],
-    ),
-    {
-      entity: RelatonBib::Person.new(
-        name: RelatonBib::FullName.new(
-          initial: [RelatonBib::LocalizedString.new("A.", "en")],
-          surname: RelatonBib::LocalizedString.new("Bierman", "en"),
-          forename: [RelatonBib::LocalizedString.new("Forename", "en")],
-          addition: [RelatonBib::LocalizedString.new("Addition", "en")],
-          prefix: [RelatonBib::LocalizedString.new("Prefix", "en")],
-        ),
-        affiliation: [RelatonBib::Affiliation.new(
-          organization: RelatonBib::Organization.new(name: "IETF", abbreviation: "IETF"),
-          description: [RelatonBib::LocalizedString.new("Description", "en")]
-        )],
-        contact: [
-          RelatonBib::Address.new(
-            street: ["Street"], city: "City", postcode: "123456",
-            country: "Country", state: "State"
-          ),
-          RelatonBib::Contact.new(type: "phone", value: "223322"),
-        ],
-        identifier: [RelatonBib::PersonIdentifier.new("uri", "www.person.com")],
-      ),
-      role: [type: "author"],
-    },
-    { entity: { name: "Institution" }, role: [type: "sponsor"] }
-  ],
-  copyright: [{
-      owner: [{
-          name: "International Organization for Standardization",
-          abbreviation: "ISO", url: "www.iso.org"
-        }],
-      from: "2014", to: "2020" 
-  }],
-  link: [
-    { type: "src", content: "https://www.iso.org/standard/53798.html" },
-    { type: "obp",
-      content: "https://www.iso.org/obp/ui/#!iso:std:53798:en" },
-    { type: "rss", content: "https://www.iso.org/contents/data/standard"\
-      "/05/37/53798.detail.rss" },
-    { type: "doi", content: "http://standrd.org/doi-123" },
-    { type: "file", content: "file://path/file" },
-  ],
-  relation: [
-    {
-      type: "updates",
-      bibitem: RelatonBib::BibliographicItem.new(
-        formattedref: RelatonBib::FormattedRef.new(content: "ISO 19115:2003"),
-      ),
-      locality: [
-        RelatonBib::LocalityStack.new([
-          RelatonBib::Locality.new("volume", "1"),
-          RelatonBib::Locality.new("section", "2"),
-        ]),
-      ],
-      source_locality: [
-        RelatonBib::SourceLocalityStack.new([
-          RelatonBib::SourceLocality.new("chapter", "4"),
-        ]),
-      ],
-    },
-    {
-      type: "updates",
-      bibitem: RelatonBib::BibliographicItem.new(
-        type: "standard",
-        formattedref: RelatonBib::FormattedRef.new(content: "ISO 19115:2003/Cor 1:2006"),
-      ),
-    },
-    {
-      type: "partOf",
-      bibitem: RelatonBib::BibliographicItem.new(
-        title: [RelatonBib::TypedTitleString.new(type: "main", content: "Book title")],
-      ),
-    },
-  ],
-  series: [
-    RelatonBib::Series.new(
-      type: "main",
-      title: RelatonBib::TypedTitleString.new(
-        type: "original", content: "ISO/IEC FDIS 10118-3", language: "en",
-        script: "Latn", format: "text/plain",
-      ),
-      place: "Serie's place",
-      organization: "Serie's organization",
-      abbreviation: RelatonBib::LocalizedString.new("ABVR"),
-      from: "2009-02-01",
-      to: "2010-12-20",
-      number: "serie1234",
-      partnumber: "part5678",
-    ),
-    RelatonBib::Series.new(
-      type: "alt",
-      formattedref: RelatonBib::FormattedRef.new(
-        content: "serieref", language: "en", script: "Latn",
-      ),
-    ),
-    RelatonBib::Series.new(
-      type: "journal", title: RelatonBib::TypedTitleString.new(content: "Journal"), number: "7"
-    ),
-    RelatonBib::Series.new(title: RelatonBib::TypedTitleString.new(content: "Series")),
-  ],
-  medium: RelatonBib::Medium.new(
-    form: "medium form", size: "medium size", scale: "medium scale",
-  ),
-  place: [
-    "bib place",
-    RelatonBib::Place.new(
-      city: "Geneva",
-      region: [RelatonBib::Place::RegionType.new(name: "Region")],
-      country: [RelatonBib::Place::RegionType.new(name: "Switzeland", iso: "SH", recommended: true)],
-    )
-  ],
-  extent: [
-    RelatonBib::BibItemLocality.new("section", "Reference from", "Reference to"),
-    RelatonBib::BibItemLocality.new("chapter", "4"),
-    RelatonBib::BibItemLocality.new("page", "10", "20"),
-    RelatonBib::BibItemLocality.new("volume", "1"),
-  ],
-  accesslocation: ["accesslocation1", "accesslocation2"],
-  classification: [
-    RelatonBib::Classification.new(type: "type", value: "value"),
-    RelatonBib::Classification.new(type: "keyword", value: "Keywords"),
-    RelatonBib::Classification.new(type: "mendeley", value: "Mendeley Tags"),
-  ],
-  validity: RelatonBib::Validity.new(
-    begins: Time.new(2010, 10, 10, 12, 21),
-    ends: Time.new(2011, 2, 3, 18,30),
-    revision: Time.new(2011, 3, 4, 9, 0),
-  )
-)
-
-=> #<RelatonBib::BibliographicItem:0x007fc8b6c796c0
+hash = YAML.load_file "spec/examples/bib_item.yml"
+=> {"id"=>"ISOTC211",
+ "title"=>["Geographic information", {"content"=>"Information géographique", "language"=>"fr", "script"=>"Latn"}],
+ ...
+
+item = RelatonBib::BibliographicItem.from_hash(hash)
+=> #<RelatonBib::BibliographicItem:0x00007f962f030710
  @abstract=
-  [#<RelatonBib::FormattedString:0x007fc8b6c726b8 @content="ISO 19115-1:2014 defines the schema required for ...", @format="text/plain", @language=["en"], @script=["Latn"]>,
+  [#<RelatonBib::FormattedString:0x00007f962f02acc0
+...
 ----
 
 === BibliographicItem Typed Title Strings
@@ -266,8 +66,17 @@ item.title lang: "fr"
 [source,ruby]
 ----
 item.abstract
-=> [#<RelatonBib::FormattedString:0x007fc8b6c726b8 @content="ISO 19115-1:2014 defines the schema required for ...", @format="text/plain", @language=["en"], @script=["Latn"]>,
- #<RelatonBib::FormattedString:0x007fc8b6c725f0 @content="L'ISO 19115-1:2014 définit le schéma requis pour ...", @format="text/plain", @language=["fr"], @script=["Latn"]>]
+=> #<RelatonBib::TypedTitleStringCollection:0x00007f962f0306c0
+ @array=
+  [#<RelatonBib::TypedTitleString:0x00007f95ee8a4298
+    @title=#<RelatonBib::FormattedString:0x00007f95ee8a41a8 @content="Geographic information", @format="text/plain", @language=nil, @script=nil>,
+    @type="title-main">,
+   #<RelatonBib::TypedTitleString:0x00007f95ee8a4040
+    @title=#<RelatonBib::FormattedString:0x00007f962f03bf70 @content="Geographic information", @format="text/plain", @language=nil, @script=nil>,
+    @type="main">,
+   #<RelatonBib::TypedTitleString:0x00007f962f030620
+    @title=#<RelatonBib::FormattedString:0x00007f962f030580 @content="Information géographique", @format="text/plain", @language=["fr"], @script=["Latn"]>,
+    @type=nil>]>
 
 item.abstract(lang: "en").to_s
 => "ISO 19115-1:2014 defines the schema required for ..."
@@ -450,37 +259,57 @@ title.format:: text/plain
 [source,ruby]
 ----
 item.to_bibxml
-<reference anchor="ISOTC211" target="https://www.iso.org/standard/53798.html">
+<reference anchor="ISO.TC.211" target="https://www.iso.org/standard/53798.html">
   <front>
     <title>Geographic information</title>
-    <seriesInfo name="DOI" value="10.17487/rfc1149"/>
-    <seriesInfo name="Internet-Draft" value="draft-ietf-somewg-someprotocol-07"/>
-    <seriesInfo name="RFC" value="4"/>
     <author>
       <organization abbrev="ISO">International Organization for Standardization</organization>
     </author>
     <author fullname="A. Bierman">
       <organization abbrev="IETF">IETF</organization>
       <address>
-        <postal>123456</postal>
+        <postal>
+          <city>City</city>
+          <code>123456</code>
+          <country>Country</country>
+          <region>State</region>
+          <street>Street</street>
+        </postal>
         <phone>223322</phone>
       </address>
     </author>
     <author role="editor">
-      <organization abbrev="IETF">IETF</organization>
+      <organization abbrev="IEEE">IEEE</organization>
     </author>
-    <author initials="A." surname="Bierman">
+    <author fullname="Forename Bierman" initials="A." surname="Bierman">
       <organization abbrev="IETF">IETF</organization>
       <address>
-        <postal>123456</postal>
+        <postal>
+          <city>City</city>
+          <code>123456</code>
+          <country>Country</country>
+          <region>State</region>
+          <street>Street</street>
+        </postal>
         <phone>223322</phone>
       </address>
     </author>
     <author>
-      <organization>Institution</organization>
+      <organization>W3C</organization>
     </author>
-    <date year="2014" month="April" day="1"/>
+    <date year="2014" month="April"/>
+    <workgroup>Editorial group</workgroup>
+    <abstract>
+      <t>ISO 19115-1:2014 defines the schema required for ...</t>
+    </abstract>
   </front>
+  <seriesInfo name="DOI" value="10.17487/rfc1149"/>
+  <seriesInfo name="Internet-Draft" value="draft-ietf-somewg-someprotocol-07"/>
+  <seriesInfo name="ISO/IEC FDIS 10118-3" value="serie1234"/>
+  <seriesInfo name="Formattedref"/>
+  <seriesInfo name="Journal" value="7"/>
+  <seriesInfo name="Series"/>
+  <seriesInfo name="RFC" value="4"/>
 </reference>
 ----
 

data/grammars/biblio.rng

@@ -614,12 +614,103 @@
     <optional>
       <ref name="fetched"/>
     </optional>
-    <choice>
-      <oneOrMore>
-        <ref name="btitle"/>
-      </oneOrMore>
+    <optional>
       <ref name="formattedref"/>
-    </choice>
+    </optional>
+    <oneOrMore>
+      <ref name="btitle"/>
+    </oneOrMore>
+    <zeroOrMore>
+      <ref name="bsource"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="docidentifier"/>
+    </oneOrMore>
+    <optional>
+      <ref name="docnumber"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="bdate"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="contributor"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="edition"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="version"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="biblionote"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="language"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="script"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bibabstract"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="status"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="copyright"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="docrelation"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="series"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="medium"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="bplace"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bprice"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="extent"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="accesslocation"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="license"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bclassification"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bkeyword"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="validity"/>
+    </optional>
+  </define>
+  <define name="ReducedBibliographicItem">
+    <optional>
+      <attribute name="type">
+        <ref name="BibItemType"/>
+      </attribute>
+    </optional>
+    <optional>
+      <ref name="fetched"/>
+    </optional>
+    <optional>
+      <ref name="formattedref"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="btitle"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="bsource"/>
     </zeroOrMore>
@@ -638,9 +729,9 @@
     <optional>
       <ref name="edition"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="version"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="biblionote"/>
     </zeroOrMore>
@@ -833,6 +924,12 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -986,36 +1083,34 @@
           <ref name="SeriesType"/>
         </attribute>
       </optional>
-      <choice>
+      <optional>
         <ref name="formattedref"/>
-        <group>
-          <ref name="btitle"/>
-          <optional>
-            <ref name="bplace"/>
-          </optional>
-          <optional>
-            <ref name="seriesorganization"/>
-          </optional>
-          <optional>
-            <ref name="abbreviation"/>
-          </optional>
-          <optional>
-            <ref name="seriesfrom"/>
-          </optional>
-          <optional>
-            <ref name="seriesto"/>
-          </optional>
-          <optional>
-            <ref name="seriesnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriespartnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriesrun"/>
-          </optional>
-        </group>
-      </choice>
+      </optional>
+      <ref name="btitle"/>
+      <optional>
+        <ref name="bplace"/>
+      </optional>
+      <optional>
+        <ref name="seriesorganization"/>
+      </optional>
+      <optional>
+        <ref name="abbreviation"/>
+      </optional>
+      <optional>
+        <ref name="seriesfrom"/>
+      </optional>
+      <optional>
+        <ref name="seriesto"/>
+      </optional>
+      <optional>
+        <ref name="seriesnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriespartnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriesrun"/>
+      </optional>
     </element>
   </define>
   <define name="SeriesType">
@@ -1174,7 +1269,7 @@
         </element>
       </optional>
       <element name="bibitem">
-        <ref name="BibliographicItem"/>
+        <ref name="ReducedBibliographicItem"/>
       </element>
       <choice>
         <zeroOrMore>
@@ -1199,9 +1294,9 @@
       <optional>
         <ref name="revision-date"/>
       </optional>
-      <zeroOrMore>
+      <optional>
         <ref name="draft"/>
-      </zeroOrMore>
+      </optional>
     </element>
   </define>
   <define name="vedition">