pubid-core 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9895b8d56bf37310135d11148c71ea31514d203a4157b6d6bcb9a4d4df81be58
-  data.tar.gz: 92d7bc8de5d97c2bda090ba2e2056819d29a31fff22f67495a7a4947ffaecc98
+  metadata.gz: 93c28e13e304c094216d1462cea591513b1aede6f05af471f3d132c3be3377b4
+  data.tar.gz: 271fe8e18f93cdc6992661dd1d947a5b0b07a94a274d89dd7a570ebebf584e62
 SHA512:
-  metadata.gz: 57ad7508563a1bd967e6d60ff78faa2ea7a26e954a001545f0220ccfbbfe6efe935d7d0f8e9a0dec06ef27fb93e5620c6a1e3ca50a43a71b019e63d5bfab4a6b
-  data.tar.gz: 0eda4ada9150f10b557a57610f802463773e8573c6f059180cec900ca769e205aa08e51e17d7152b11be88d57fd261b9b1b19d22f5744b51711b5ad1363569d8
+  metadata.gz: 6d2f3e659948c50b0adbbcf3bcc493fc3de30c18328152dc68763c54d194ddf632008a82794101110fd292fadaef4f66aca698da69e907f2499906eb9bbcbb5a
+  data.tar.gz: 979782c7e32cb6887f0bac5d308a140eba206bee84b994d9137aeb952ebb6d2419f3c5c7a3c3baa989e3e46753659c9ccdec21374e26afedbe96491cbdb8f6aa

data/lib/pubid/core/identifier.rb

@@ -24,7 +24,7 @@ module Pubid::Core
                         end
       end
 
-      opts.each { |key, value| send("#{key}=", value.is_a?(Array) && value || value.to_s) }
+      opts.each { |key, value| send("#{key}=", value.is_a?(Parslet::Slice) && value.to_s || value) }
     end
 
     def urn

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

@@ -15,12 +15,13 @@ module Pubid::Core::Renderer
 
     def prerender_params(params, opts)
       params.map do |key, value|
+        next unless value
         if respond_to?("render_#{key}")
           [key, send("render_#{key}", value, opts, params)]
         else
           [key, value]
         end
-      end.to_h
+      end.compact.to_h
     end
 
     # render from hash keys
@@ -50,11 +51,11 @@ module Pubid::Core::Renderer
     end
 
     def render_amendments(amendments, _opts, _params)
-      amendments.map(&:render_pubid).join("+")
+      amendments.sort.map(&:render_pubid).join("+")
     end
 
     def render_corrigendums(corrigendums, _opts, _params)
-      corrigendums.map(&:render_pubid).join("+")
+      corrigendums.sort.map(&:render_pubid).join("+")
     end
 
     def render_type(type, opts, params)

data/lib/pubid/core/supplement.rb

@@ -1,13 +1,18 @@
 module Pubid::Core
   class Supplement
-    attr_accessor :version, :number, :stage
+    include Comparable
+    attr_accessor :version, :number
 
-    def initialize(version:, number: nil, stage: nil)
-      @version, @number, @stage = version, number, stage
+    def initialize(version:, number: nil)
+      @version, @number = version&.to_i, number&.to_i
     end
 
-    def ==(other)
-      other.version == version && (number.nil? || other.number == number) && (stage.nil? || other.stage == stage)
+    def <=>(other)
+      return 0 if number.nil? && other.number
+
+      return number <=> other.number if version == other.version
+
+      (version <=> other.version) || number <=> other.number
     end
 
     def render_pubid_number

data/lib/pubid/core/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Core
-    VERSION = "0.1.7".freeze
+    VERSION = "0.2.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-core
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-10 00:00:00.000000000 Z
+date: 2022-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake