pubid-bsi 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdf480ac6bf4dbd931083f12b08fd6cff1bb92ef22efde2a19bc224b0cd31210
-  data.tar.gz: 3f7db131a28ad7162f6973faf6be1d0fff9499b27a5a78daf4b1bf47495aaf89
+  metadata.gz: b9b1b24dd6dc7d676b713c129048024912b0be521e85ad82eb7799e1907777e3
+  data.tar.gz: 3a4a26d9876e256b37eac627980ef641f119ba8c5589533a77650d0bb927d25b
 SHA512:
-  metadata.gz: c8a8295cef8551270b33ae2c5eb56209fa7f8742cf7fdbb90855750fd0786d313b835e81a12b5bd0df08d8811935069e4b47e90efa8cb8493d2faee51323d248
-  data.tar.gz: 7a9147d773e5da21eaf335aa16182506fc7459f1cbd2eef190555b0ef41aac2f2d8e550ff746645b7e2a647cb7df3eb81cd91db38572de9c49290ce51705873d
+  metadata.gz: 8ddbaa4e4c855b9f2f4e13aa0142eb52da46245cb4af1a72af6af58963cb82ce1390cc6f757323e5d14a5f748584fc67e766cfa2e04db99998c69f9e038eec30
+  data.tar.gz: bf664f8fe1d9689a7287ec82ae76eae731dca7e9adb1af193b1b3914e33748b29aebca68a523f1d96121a9fc0c5461ff428db8d523eb61526b57206e767102af

data/lib/pubid/bsi/identifier/collection.rb

@@ -15,7 +15,7 @@ module Pubid::Bsi
       end
 
       def to_s
-        Renderer::Collection.new(get_params).render
+        Renderer::Collection.new(to_h(deep: false)).render
       end
     end
   end

data/lib/pubid/bsi/renderer/base.rb

@@ -3,10 +3,21 @@ module Pubid::Bsi::Renderer
     TYPE = "".freeze
 
     def render_identifier(params)
-      suffix = "%{supplement}%{tracked_changes}%{translation}%{pdf}" % params
-      return "%{publisher} %{adopted}#{suffix}" % params unless params[:adopted].to_s.empty?
-
-      "%{publisher} %{number}%{part}%{edition}%{year}%{month}#{suffix}" % params
+      suffix = "%{year}%{month}%{supplement}%{tracked_changes}%{translation}%{pdf}" % params
+      unless params[:adopted].to_s.empty?
+        # ignore year for adopted document if already defined for base document
+        unless params[:year].empty?
+          params[:adopted].year = nil
+          # ignore year for adopted identifier assigned to adopted identifier
+          if params[:adopted].respond_to?(:adopted) && params[:adopted].adopted
+            params[:adopted].adopted.year = nil
+          end
+        end
+
+        return "%{publisher} %{adopted}#{suffix}" % params
+      end
+
+      "%{publisher} %{number}%{part}%{edition}#{suffix}" % params
     end
 
     def render_month(month, _opts, _params)

data/lib/pubid/bsi/transformer.rb

@@ -15,9 +15,9 @@ module Pubid::Bsi
       { supplement:
           case context[:supplement][:type]
           when "A"
-            Identifier::Amendment.new(**context[:supplement])
+            Identifier::Amendment.new(**context[:supplement].dup.tap { |h| h.delete(:type) })
           when "C"
-            Identifier::Corrigendum.new(**context[:supplement])
+            Identifier::Corrigendum.new(**context[:supplement].dup.tap { |h| h.delete(:type) })
           end
        }
     end

data/lib/pubid/bsi/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Bsi
-    VERSION = "0.3.1".freeze
+    VERSION = "0.3.3".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-bsi
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-09 00:00:00.000000000 Z
+date: 2024-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -53,61 +53,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pubid-core
+  name: pubid-cen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.6
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.6
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
-  name: pubid-iso
+  name: pubid-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.12.2
 - !ruby/object:Gem::Dependency
   name: pubid-iec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
-  name: pubid-cen
+  name: pubid-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.7.1
 description: Library to generate, parse and manipulate ISO PubID.
 email:
 - open.source@ribose.com