pubid-core 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b85bcef46a9327cb4c9ae474a84dea3b3986990082459b2f2bb37aa1c7578861
-  data.tar.gz: b7caa4de8dd3ac5c9e9b0d9bed0f3690207f48b5ec6366d4515a2ab138ab5b92
+  metadata.gz: bd421b7145aba335def612737e0623052e982465c453e4afa7f1b4ceb594b93b
+  data.tar.gz: c2ac27fb623b17a75b99a19ebda2f76eb435b0c49030d1196fb7bcabb1b078ff
 SHA512:
-  metadata.gz: 70ab4b5c6c3393811c898e3d66dbb9c1f1f80b34a5f9337697748ef06a6ee5f3331828b731b776fedeb44379c7766dda901cca146e15ba62731b17258e7d7cb5
-  data.tar.gz: 518912efd803e1ee6cef6d189fd618f4f52300109d057b35f9061437a199488b74c09cf2cafbb9622fe9a49c4e8fd7a0cea96e4e2861f53b6014e06277444c80
+  metadata.gz: 9075f028fa92e30ca75a48ee8dec47cc89ede6939c4ba9a0e4b52bf8ea2909d91d3c9696ab9f3aa4a0da7963a0a7e2e521a2bc8222675cdc55107352c703ccc3
+  data.tar.gz: 77749d0dc8d056906215f59878d1b37c41b555260139c1b2bdff108f8fdc7fb5d81249c258f1b49645d8143c19fd342707c88045734e6b3383fd1fd567799c9b

data/lib/pubid/core/configuration.rb

@@ -1,6 +1,10 @@
 module Pubid::Core
   class Configuration
-    attr_accessor :stages, :default_type, :type_class, :types, :type_names
+    attr_accessor :stages, :default_type, :type_class, :types, :type_names, :stage_class
 
+    def initialize
+      @type_class = Pubid::Core::Type
+      @stage_class = Pubid::Core::Stage
+    end
   end
 end

data/lib/pubid/core/identifier.rb

@@ -44,15 +44,15 @@ module Pubid::Core
     end
 
     def build_stage(**args)
-      Stage.new(config: @config, **args)
+      @config.stage_class.new(config: @config, **args)
     end
 
     def parse_stage(stage)
-      Stage.parse(stage, config: @config)
+      @config.stage_class.parse(stage, config: @config)
     end
 
     def has_stage?(stage)
-      Stage.has_stage?(stage, config: @config)
+      @config.stage_class.has_stage?(stage, config: @config)
     end
 
     def build_type(type, **args)

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

@@ -78,11 +78,7 @@ module Pubid::Core::Renderer
     # @param with_date [Boolean] include year in output
     # @param with_language_code [:iso,:single] render document language as 2-letter ISO 639-1 language code or single code
     def render(with_date: true, with_language_code: :iso, **args)
-      if %i(amd cor).include? @params[:type]&.type
-        render_supplement(@params, **args.merge({ with_date: with_date, with_language_code: with_language_code}))
-      else
-        render_base_identifier(**args.merge({ with_date: with_date, with_language_code: with_language_code})) + @prerendered_params[:language].to_s
-      end
+      render_base_identifier(**args.merge({ with_date: with_date, with_language_code: with_language_code})) + @prerendered_params[:language].to_s
     end
 
     def render_identifier(params)

data/lib/pubid/core/stage.rb

@@ -56,11 +56,11 @@ module Pubid::Core
 
     def self.parse(stage, config:)
       if /\A[\d.]+\z/.match?(stage)
-        Stage.new(harmonized_code: stage, config: config)
+        new(harmonized_code: stage, config: config)
       else
         raise Errors::StageInvalidError unless stage.is_a?(Symbol) || stage.is_a?(String) || stage.is_a?(Parslet::Slice)
 
-        Stage.new(abbr: stage.to_s, config: config)
+        new(abbr: stage.to_s, config: config)
       end
     end
 

data/lib/pubid/core/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Core
-    VERSION = "1.6.0".freeze
+    VERSION = "1.7.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-core
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-18 00:00:00.000000000 Z
+date: 2023-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake