pubid-iso 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11124938cd55ceae313c720ac11b3c19c475e1398bb7e0eed93ac07ebbbe9eb4
-  data.tar.gz: 72de1b3ce2af85a21b888e2180410d5efbe57f6ea297ff7b412a9758e024d1e5
+  metadata.gz: e0cd99c30184d624f0019e7d10fd9d3d752e86ff701b4852de0d97f79e9ac095
+  data.tar.gz: 1c2c1988f300757de153e28ff528f01a488c058e2b3b49a41be94a73ef242397
 SHA512:
-  metadata.gz: dd4d5c372306186736e8c44c446e445758c8b7d871d73454096c739ed1e5e7fcc7890b8ea0189c44f5418150d54f6802d325687ab77dcf71984277ec244f303a
-  data.tar.gz: f93770f6fb62a8401e99a59d1e47c99eb6f97c5be34385acb9f01187bb8eab504ccff0dc8ae50162037ef3f5080a0e0f2a8add11a2f789ef67cf153128c339eb
+  metadata.gz: 7f63fbc6f3f030698619fa235ee2ba17bc3ba8d237ae05b2b0397a6e211654defe106d6f13fabf4c28e40470bc8ba68664b07ff90ec12f8e1fb7d7f33a1302b2
+  data.tar.gz: dfa9bcb9441abc1ce2d5e56cce1ea915d72f3c9599ba64b6ec5e554e464397fe22940abc659eee1298136abba27acc26d5457f8e025a2f648a1fa32dfbe88159

data/lib/pubid/iso/identifier/base.rb

@@ -11,8 +11,6 @@ module Pubid::Iso
                     :iteration, :joint_document,
                     :tctype, :sctype, :wgtype, :tcnumber, :scnumber, :wgnumber,
                     :dirtype,
-                    # supplement for DIR type identifiers
-                    :supplement,
                     :base,
                     :typed_stage,
                     :supplements,
@@ -24,7 +22,7 @@ module Pubid::Iso
       # @param stage [Stage, Symbol, String] stage or typed stage, e.g. "PWI", "NP", "50.00", Stage.new(abbr: :WD), "DTR"
       # @param iteration [Integer] document iteration, eg. "1", "2", "3"
       # @param joint_document [Identifier] joint document
-      # @param supplement [Supplement] supplement
+      # @param supplements [Array<Supplement>] supplements
       # @param tctype [String] Technical Committee type, eg. "TC", "JTC"
       # @param sctype [String] TC subsommittee, eg. "SC"
       # @param wgtype [String] TC working group type, eg. "AG", "AHG"
@@ -44,12 +42,12 @@ module Pubid::Iso
       # @see Identifier
       # @see Pubid::Core::Identifier
       # @see Parser
-      def initialize(publisher: "ISO", number: nil, stage: nil, iteration: nil, supplement: nil,
+      def initialize(publisher: "ISO", number: nil, stage: nil, iteration: nil,
                      joint_document: nil, tctype: nil, sctype: nil, wgtype: nil, tcnumber: nil,
                      scnumber: nil, wgnumber:nil,
                      dir: nil, dirtype: nil, year: nil, amendments: nil,
                      corrigendums: nil, type: nil, base: nil, supplements: nil,
-                     part: nil, addendum: nil, **opts)
+                     part: nil, addendum: nil, edition: nil, **opts)
         super(**opts.merge(number: number, publisher: publisher, year: year,
                            amendments: amendments, corrigendums: corrigendums))
 
@@ -64,25 +62,12 @@ module Pubid::Iso
         end
 
         if stage
-          if stage.is_a?(Pubid::Core::Stage)
-            @stage = stage
-            @typed_stage = resolve_typed_stage(@stage.harmonized_code) unless @stage.abbr
-          elsif self.class.has_typed_stage?(stage)
-            @typed_stage, @stage = find_typed_stage(stage)
-          else
-            @stage = Identifier.parse_stage(stage)
-            # resolve typed stage when harmonized code provided as stage
-            # or stage abbreviation was not resolved
-            if /\A[\d.]+\z/.match?(stage) || @stage.empty_abbr?(with_prf: true)
-              @typed_stage = resolve_typed_stage(@stage.harmonized_code)
-            end
-          end
+          @typed_stage, @stage = resolve_stage(stage)
         elsif iteration && !is_a?(Supplement)
           raise Errors::IterationWithoutStageError, "Document without stage cannot have iteration"
         end
 
         @iteration = iteration.to_i if iteration
-        @supplement = supplement if supplement
         @joint_document = joint_document if joint_document
         @tctype = tctype if tctype
         @sctype = sctype.to_s if sctype
@@ -95,47 +80,7 @@ module Pubid::Iso
         @base = base if base
         @part = part if part
         @addendum = addendum if addendum
-      end
-
-      # @param typed_stage [String, Symbol] eg. "DTR" or :dtr
-      # @return [[Symbol, Stage]] typed stage and stage with assigned harmonized codes
-      def find_typed_stage(typed_stage)
-        if typed_stage.is_a?(Symbol)
-          return [typed_stage,
-                  Identifier.build_stage(
-                    harmonized_code: Identifier.build_harmonized_stage_code(self.class::TYPED_STAGES[typed_stage][:harmonized_stages])),
-          ]
-        end
-
-        typed_stage = self.class::TYPED_STAGES.find do |_, v|
-          if v[:abbr].is_a?(Hash)
-            v[:abbr].value?(typed_stage)
-          else
-            if v.key?(:legacy_abbr)
-              v[:legacy_abbr].include?(typed_stage) || v[:abbr] == typed_stage
-            else
-              v[:abbr] == typed_stage
-            end
-            #
-            # v[:abbr] == typed_stage
-          end
-        end
-
-        [typed_stage.first,
-         Identifier.build_stage(
-           harmonized_code: Identifier.build_harmonized_stage_code(typed_stage[1][:harmonized_stages]))]
-      end
-
-      # Resolve typed stage using stage harmonized stage code
-      # @param harmonized_code [HarmonizedStageCode]
-      # @return [Symbol, nil] typed stage or nil
-      def resolve_typed_stage(harmonized_code)
-        self.class::TYPED_STAGES.each do |k, v|
-          if (v[:harmonized_stages] & harmonized_code.stages) == harmonized_code.stages
-            return k
-          end
-        end
-        nil
+        @edition = edition
       end
 
       class << self
@@ -179,7 +124,7 @@ module Pubid::Iso
           end.inject({}, :merge)
 
           # return supplement if supplements applied
-          if identifier_params[:supplements]
+          if identifier_params[:supplements] && identifier_params[:supplements].is_a?(Array)
             return transform_supplements(
               identifier_params[:supplements],
               identifier_params.dup.tap { |h| h.delete(:supplements) }
@@ -196,24 +141,6 @@ module Pubid::Iso
           Identifier.create(**identifier_params)
         end
 
-        # @param typed_stage [String, Symbol] typed stage, eg. "DTR" or :dtr
-        # @return [Boolean] true when identifier has associated typed stage
-        def has_typed_stage?(typed_stage)
-          return self::TYPED_STAGES.key?(typed_stage) if typed_stage.is_a?(Symbol)
-
-          self::TYPED_STAGES.any? do |_, v|
-            if v[:abbr].is_a?(Hash)
-              v[:abbr].value?(typed_stage)
-            else
-              if v.key?(:legacy_abbr)
-                v[:legacy_abbr].include?(typed_stage) || v[:abbr] == typed_stage
-              else
-                v[:abbr] == typed_stage
-              end
-            end
-          end
-        end
-
         def get_amendment_class
           Pubid::Iso::Amendment
         end
@@ -238,6 +165,10 @@ module Pubid::Iso
           UPDATE_CODES
         end
 
+        def get_identifier
+          Identifier
+        end
+
         def type_match?(parameters)
           parameters[:type] ? has_type?(parameters[:type]) : has_typed_stage?(parameters[:stage])
         end
@@ -251,16 +182,6 @@ module Pubid::Iso
         ).render + (language ? ":#{language}" : "")
       end
 
-      def get_params
-        instance_variables.map do |var|
-          if var.to_s == "@typed_stage" && @typed_stage
-            [:typed_stage, self.class::TYPED_STAGES[@typed_stage][:abbr]]
-          else
-            [var.to_s.gsub("@", "").to_sym, instance_variable_get(var)]
-          end
-        end.to_h
-      end
-
       # @param format [:ref_num_short,:ref_num_long,:ref_dated,:ref_dated_long,:ref_undated,:ref_undated_long] create reference with specified format
       # Format options are:
       #   :ref_num_short -- instance reference number: 1 letter language code + short form (DAM) + dated
@@ -333,23 +254,6 @@ module Pubid::Iso
       end
 
       # Return typed stage abbreviation, eg. "FDTR", "DIS", "TR"
-      def typed_stage_abbrev
-        if self.class::TYPED_STAGES.key?(typed_stage)
-          self.class::TYPED_STAGES[typed_stage][:abbr]
-        else
-          stage ? "#{stage.abbr} #{type[:key].to_s.upcase}" : type[:key].to_s.upcase
-        end
-      end
-
-      # Return typed stage name, eg. "Final Draft Technical Report" for "FDTR"
-      def typed_stage_name
-        if self.class::TYPED_STAGES.key?(typed_stage)
-          self.class::TYPED_STAGES[typed_stage][:name]
-        else
-          stage ? "#{stage.name} #{type[:title]}" : type[:title]
-        end
-      end
-
       # returns root identifier
       def root
         return base.base if base&.base

data/lib/pubid/iso/identifier/directives.rb

@@ -8,6 +8,13 @@ module Pubid::Iso
 
       TYPED_STAGES = {}.freeze
 
+      attr_accessor :edition_publisher
+
+      def initialize(edition_publisher: nil, **opts)
+        super(**opts)
+        @edition_publisher = edition_publisher
+      end
+
       def self.type
         { key: :dir, title: "Directives" }
       end

data/lib/pubid/iso/identifier/international_standard.rb

@@ -21,11 +21,7 @@ module Pubid::Iso
         },
       }.freeze
 
-      def initialize(publisher: "ISO", number: nil, stage: nil, iteration: nil, supplement: nil,
-                     joint_document: nil, tctype: nil, sctype: nil, wgtype: nil, tcnumber: nil,
-                     scnumber: nil, wgnumber:nil,
-                     dir: nil, dirtype: nil, year: nil, amendments: nil,
-                     corrigendums: nil, type: nil, base: nil, supplements: nil, **opts)
+      def initialize(stage: nil, iteration: nil, **opts)
 
         if iteration && stage.nil?
           raise Errors::IsStageIterationError, "IS stage document cannot have iteration"

data/lib/pubid/iso/parser.rb

@@ -169,9 +169,13 @@ module Pubid::Iso
       ((str("DIR") | str("Directives Part") | str("Directives, Part") | str("Directives,")).as(:type) >> space).maybe >>
         (str("JTC").as(:dirtype) >> space).maybe >>
         (digits.as(:number) >> (str(":") >> year).maybe).maybe >>
-        (str(" -- Consolidated").maybe >> (space? >> (organization.as(:publisher) >> space).maybe >>
-          (array_to_str(DIR_SUPPLEMENTS)) >> (str(":") >> year).maybe >>
-          dir_supplement_edition.maybe).repeat(1).as(:supplements)).maybe
+        (str(" -- Consolidated").maybe >> (str("").as(:mark) >> space? >>
+          (organization.as(:publisher) >> space?).maybe >>
+          array_to_str(DIR_SUPPLEMENTS) >> (str(":") >> year).maybe >>
+          dir_supplement_edition.maybe).repeat(1).as(:supplements)).maybe >>
+          # parse identifiers with publisher at the end, e.g. "ISO/IEC DIR 2 ISO"
+          (space >> organization.as(:publisher) >> (str(":") >> year).maybe).as(:edition).maybe
+
     end
 
     rule(:std_document_body) do

data/lib/pubid/iso/renderer/dir.rb

@@ -4,12 +4,12 @@ module Pubid::Iso::Renderer
   class Dir < Base
 
     def render_identifier(params, opts)
-      res = ("%{publisher} DIR%{dirtype}%{number}%{year}%{supplement}" % params)
+      res = ("%{publisher} DIR%{dirtype}%{number}%{year}%{edition}" % params)
 
       if params.key?(:joint_document)
         joint_params = prerender_params(params[:joint_document].get_params, {})
         joint_params.default = ""
-        res += (" + %{publisher}%{dirtype}%{number}%{year}%{supplement}" % joint_params)
+        res += (" + %{publisher}%{dirtype}%{number}%{year}" % joint_params)
       end
 
       res
@@ -23,13 +23,8 @@ module Pubid::Iso::Renderer
       " #{dirtype}"
     end
 
-    def render_supplement(supplement, _opts, _params)
-      if supplement.publisher && supplement.publisher != ""
-        " #{supplement.publisher} SUP"
-      else
-        " SUP"
-      end + (supplement.year && ":#{supplement.year}" || "") +
-        (supplement.edition && " Edition #{supplement.edition}" || "")
+    def render_edition(edition, _opts, _params)
+      " #{edition[:publisher]}" + (edition[:year] ? ":#{edition[:year]}" : "")
     end
   end
 end

data/lib/pubid/iso/transformer.rb

@@ -15,28 +15,30 @@ module Pubid::Iso
     end
 
     rule(supplements: subtree(:supplements)) do |context|
-      context[:supplements] =
-        context[:supplements].map do |supplement|
-          if supplement[:typed_stage]
-            supplement.merge(
-              case supplement[:typed_stage]
-              when "PDAM"
-                { typed_stage: "CD", type: "Amd" }
-              when "pDCOR"
-                { typed_stage: "CD", type: "Cor" }
+      if context[:supplements].is_a?(Array)
+        context[:supplements] =
+          context[:supplements].map do |supplement|
+            if supplement[:typed_stage]
+              supplement.merge(
+                case supplement[:typed_stage]
+                when "PDAM"
+                  { typed_stage: "CD", type: "Amd" }
+                when "pDCOR"
+                  { typed_stage: "CD", type: "Cor" }
+                else
+                  {}
+                end
+              )
+            else
+              case supplement[:type]
+              when "Addendum"
+                supplement.merge({ type: "Add" })
               else
-                {}
+                supplement
               end
-            )
-          else
-            case supplement[:type]
-            when "Addendum"
-              supplement.merge({ type: "Add" })
-            else
-              supplement
             end
           end
-        end
+      end
       context
     end
 

data/lib/pubid/iso/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Iso
-    VERSION = "0.6.0".freeze
+    VERSION = "0.6.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-iso
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-21 00:00:00.000000000 Z
+date: 2023-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.6
+        version: 1.8.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.6
+        version: 1.8.7
 description: Library to generate, parse and manipulate ISO PubID.
 email:
 - open.source@ribose.com
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Library to generate, parse and manipulate ISO PubID.