relaton-render 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f168f3ef6e4f5baf6efd001c182cf239681199742561699c8e4d3d5784b4b282
-  data.tar.gz: 0ef031d1a92b9f8bcd67d1328b9305b8d2222c9f1b767d78d0c03f7a6325d70c
+  metadata.gz: 67568cad7210dff0b205836fc4383d409b5f8b38b49a776a8ed67e2507c8e145
+  data.tar.gz: fafb18d828ea75cdc786cce531da42c972b2472d3911fdfe92b5428988fcce04
 SHA512:
-  metadata.gz: 4189b0b9bd03f96bf3f67f00e94973dd0289d968ff3f3395bbd09f2a1c0ff5d0e2641e532c78579bc1a841cee06c379b7ecc43d247fbc8509f8c7a06a756a402
-  data.tar.gz: 810cbb87d5eeffe1f88f21f4cfbdb04a1ab905bc34f857d06218ea4a09f1efd8a65a3814756143204c9110be568691d5247089ebf41a5c0cefcda4b1e74376ba
+  metadata.gz: 759d9da2be9ac7ce34abd03e9458c7ccec8075930061adc6002ebae138cde6f35cb8a6eb714a69bd22d8e134a7c6f08bda1b3f8e722e418ada17fd416e33a7e1
+  data.tar.gz: 44040060e55e3396c257838f7cf73a6ba85a4b2da203c4d1fd676fd04222051f8e4030ec3f5bd3a2c2093d671d56f13529d16c929ea16861d298b2f7d597ff8a

data/README.adoc

@@ -296,6 +296,9 @@ The `seriestemplate` is a template for the rendering of series information. It d
 | series_num  | ./series[@type = 'main' or not(@type) or true]/number | | Y |
 | series_partnumber  | ./series[@type = 'main' or not(@type) or true]/partnumber | | Y |
 | series_run  | ./series[@type = 'main' or not(@type) or true]/run | | Y |
+| series_place  | ./series[@type = 'main' or not(@type) or true]/place | | Y |
+| series_organization  | ./series[@type = 'main' or not(@type) or true]/organization | | Y |
+| series_dates  | ./series[@type = 'main' or not(@type) or true]/from, ./series[@type = 'main' or not(@type) or true]/to | | Y |
 |===
 
 For example: `{% if series_abbr %}{{series_abbr}}{% else %}{{series_title}}{% endif %} ,_({{series_run}}) {{series_num}}|({{series_partnumber}})`

data/lib/relaton/render/fields/fields.rb

@@ -72,7 +72,7 @@ module Relaton
 
       def seriesformat(hash)
         parts = %i(series_title series_abbr series_num series_partnumber
-                   series_run series_formatted)
+                   series_run series_formatted series_dates series_place series_org)
         series_out = parts.each_with_object({}) do |i, m|
           m[i] = hash[i]
         end

data/lib/relaton/render/general/render.rb

@@ -114,13 +114,16 @@ module Relaton
         parse(bib, embedded: embedded)
       end
 
+      def fmtref(doc)
+        "<formattedref>#{doc}</formattedref>"
+      end
+
       def parse(doc, embedded: false)
         f = doc.formattedref and
-          return embedded ? f.children.to_xml : doc.to_xml
-
+          return embedded ? f.content : fmtref(f.content)
         ret = parse1(doc) or return nil
         embedded and return ret
-        "<formattedref>#{ret}</formattedref>"
+        fmtref(ret)
       end
 
       def renderer(type)

data/lib/relaton/render/parse/parse.rb

@@ -60,7 +60,10 @@ module Relaton
           series_abbr: series_abbr(series, doc),
           series_run: series_run(series, doc),
           series_num: series_num(series, doc),
-          series_partnumber: series_partnumber(series, doc) }
+          series_partnumber: series_partnumber(series, doc),
+          series_place: series_place(series, doc),
+          series_org: series_org(series, doc),
+          series_dates: series_dates(series, doc) }
       end
     end
   end

data/lib/relaton/render/parse/parse_extract.rb

@@ -90,6 +90,21 @@ module Relaton
         series.run
       end
 
+      def series_org(series, _doc)
+        series.organization
+      end
+
+      def series_place(series, _doc)
+        series.place
+      end
+
+      def series_dates(series, _doc)
+        f = series.from
+        t = series.to
+        f || t or return nil
+        "#{f}–#{t}"
+      end
+
       def authoritative_identifier(doc)
         out = doc.docidentifier.each_with_object([]) do |id, ret|
           id.primary && !authoritative_identifier_exclude.include?(id.type) and

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "0.6.0".freeze
+    VERSION = "0.6.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-09 00:00:00.000000000 Z
+date: 2023-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler