pubid-iso 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4fd0f754d87e7496c307221422d69bb36c6d4b497843eafa27a547d68bcd4e6
-  data.tar.gz: c1d58a83fb0d672111b9fe6d0dc28df87c0070e483c3c19d487e7c2618c99293
+  metadata.gz: 1be767645c955bb6ca456984b088d443786947ced66241b01f0ece4e772e37cc
+  data.tar.gz: ed2de74d63898105105b3edba5afa50c4e0133619c17be50c42c0e2a2c58dc32
 SHA512:
-  metadata.gz: aff91d1b6b5bc709bb4929b2901ac7ee53e35a2e67e403f4c3eec4123b8ab29a4d42604ae06ff0777be19b29d598139b224bfd7f34fe206595f3946147fb440b
-  data.tar.gz: ec6219d66f0b62c97bb20c09adcb3c53f3d63f7fb245228e3463fe47b33d37087574f6a327461f839b0eef1f713c8ce33dd1408619194814fda9ccc8938fdab1
+  metadata.gz: b9faf9bc67c1995284a1e68cef72f4b52324875c16371f0c0ab37db06a565a2673134931808426edddfaad775db7cc10c586bb3b66f835f56a8a90a8775afb68
+  data.tar.gz: c97332b884ecfa4f4a363c0a0825d028ca1899405f1d1d133cbd5538baf6683716fb5c5e530ffa4a186b53da6521c6d678308f370755a89e4be40163d90da76a

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

@@ -13,7 +13,7 @@ module Pubid::Iso
         },
       }.freeze
       def self.type
-        { key: :add, title: "Addendum" }
+        { key: :add, title: "Addendum", short: "ADD" }
       end
 
       def self.get_renderer_class

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

@@ -21,7 +21,7 @@ module Pubid::Iso
         },
       }.freeze
       def self.type
-        { key: :amd, title: "Amendment" }
+        { key: :amd, title: "Amendment", short: "AMD" }
       end
 
       def self.get_renderer_class

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

@@ -12,16 +12,17 @@ module Pubid::Iso
                     :tctype, :sctype, :wgtype, :tcnumber, :scnumber, :wgnumber,
                     :dirtype,
                     :base,
-                    # :typed_stage,
                     :supplements,
-                    :addendum
+                    :addendum,
+                    :jtc_dir,
+                    :month
 
       # Creates new identifier from options provided, includes options from
       # Pubid::Core::Identifier#initialize
       #
       # @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 joint_document [Identifier, Hash] joint document
       # @param supplements [Array<Supplement>] supplements
       # @param tctype [String] Technical Committee type, eg. "TC", "JTC"
       # @param sctype [String] TC subsommittee, eg. "SC"
@@ -30,8 +31,9 @@ module Pubid::Iso
       # @param scnumber [Integer] Subsommittee number, eg. "1", "2"
       # @param wgnumber [Integer] Working group number, eg. "1", "2"
       # @param dirtype [String] Directives document type, eg. "JTC"
-      # @param base [Identifier] base document for supplement's identifier
+      # @param base [Identifier, Hash] base document for supplement's identifier
       # @param type [nil, :tr, :ts, :amd, :cor, :guide, :dir, :tc, Type] document's type, eg. :tr, :ts, :amd, :cor, Type.new(:tr)
+      # @param jtc_dir [String] String to indicate "JTC 1 Directives" identifier
       # @raise [Errors::SupplementWithoutYearOrStageError] when trying to apply
       #   supplement to the document without edition year or stage
       # @raise [Errors::IsStageIterationError] when trying to apply iteration
@@ -47,7 +49,7 @@ module Pubid::Iso
                      scnumber: nil, wgnumber:nil,
                      dir: nil, dirtype: nil, year: nil, amendments: nil,
                      corrigendums: nil, type: nil, base: nil, supplements: nil,
-                     part: nil, addendum: nil, edition: nil, **opts)
+                     part: nil, addendum: nil, edition: nil, jtc_dir: nil, month: nil, **opts)
         super(**opts.merge(number: number, publisher: publisher, year: year,
                            amendments: amendments, corrigendums: corrigendums))
 
@@ -68,7 +70,13 @@ module Pubid::Iso
         end
 
         @iteration = iteration.to_i if iteration
-        @joint_document = joint_document if joint_document
+        if joint_document
+          if joint_document.is_a?(Hash)
+            @joint_document = Identifier.create(**joint_document)
+          else
+            @joint_document = joint_document
+          end
+        end
         @tctype = tctype if tctype
         @sctype = sctype.to_s if sctype
         @wgtype = wgtype.to_s if wgtype
@@ -77,10 +85,20 @@ module Pubid::Iso
         @wgnumber = wgnumber.to_s if wgnumber
         @dir = dir.to_s if dir
         @dirtype = dirtype.to_s if dirtype
-        @base = base if base
+        if jtc_dir
+          @jtc_dir = jtc_dir
+        end
+        if base
+          if base.is_a?(Hash)
+            @base = Identifier.create(**base)
+          else
+            @base = base
+          end
+        end
         @part = part if part
         @addendum = addendum if addendum
         @edition = edition
+        @month = month
       end
 
       class << self
@@ -97,6 +115,7 @@ module Pubid::Iso
         def transform_supplements(supplements_params, base_params)
           supplements = supplements_params.map do |supplement|
             Identifier.create(number: supplement[:number], year: supplement[:year],
+                month: supplement[:month],
                 stage: supplement[:typed_stage], edition: supplement[:edition],
                 iteration: supplement[:iteration], type: (supplement[:type] || !supplement[:typed_stage] && :sup),
                 publisher: supplement[:publisher], base: Identifier.create(**base_params))

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

@@ -22,7 +22,7 @@ module Pubid::Iso
       }.freeze
 
       def self.type
-        { key: :cor, title: "Corrigendum" }
+        { key: :cor, title: "Corrigendum", short: "COR" }
       end
 
       def self.get_renderer_class

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

@@ -0,0 +1,17 @@
+require_relative "../renderer/data"
+
+module Pubid::Iso
+  module Identifier
+    class Data < Base
+      def_delegators 'Pubid::Iso::Identifier::Data', :type
+
+      def self.type
+        { key: :data, title: "Data", short: "DATA" }
+      end
+
+      def self.get_renderer_class
+        Renderer::Data
+      end
+    end
+  end
+end

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

@@ -16,7 +16,7 @@ module Pubid::Iso
       end
 
       def self.type
-        { key: :dir, title: "Directives" }
+        { key: :dir, title: "Directives", short: "DIR" }
       end
 
       def self.get_renderer_class

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

@@ -8,7 +8,7 @@ module Pubid::Iso
       TYPED_STAGES = {}.freeze
 
       def self.type
-        { key: :ext, title: "Extract" }
+        { key: :ext, title: "Extract", short: "EXT" }
       end
 
       def self.get_renderer_class

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

@@ -25,7 +25,7 @@ module Pubid::Iso
       end
 
       def self.type
-        { key: :guide, title: "Guide" }
+        { key: :guide, title: "Guide", short: "GUIDE" }
       end
     end
   end

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

@@ -39,7 +39,7 @@ module Pubid::Iso
       end
 
       def self.type
-        { key: :is, title: "International Standard" }
+        { key: :is, title: "International Standard", short: nil }
       end
     end
   end

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

@@ -19,7 +19,7 @@ module Pubid::Iso
       }.freeze
 
       def self.type
-        { key: :isp, title: "International Standardized Profile" }
+        { key: :isp, title: "International Standardized Profile", short: "ISP" }
       end
 
       def self.get_renderer_class

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

@@ -14,7 +14,7 @@ module Pubid::Iso
       }.freeze
 
       def self.type
-        { key: :iwa, title: "International Workshop Agreement" }
+        { key: :iwa, title: "International Workshop Agreement", short: "IWA" }
       end
 
       def self.get_renderer_class

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

@@ -19,7 +19,7 @@ module Pubid::Iso
       }.freeze
 
       def self.type
-        { key: :pas, title: "Publicly Available Specification" }
+        { key: :pas, title: "Publicly Available Specification", short: "PAS" }
       end
 
       def self.get_renderer_class

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

@@ -8,7 +8,7 @@ module Pubid::Iso
       TYPED_STAGES = {}.freeze
 
       def self.type
-        { key: :r, title: "Recommendation" }
+        { key: :r, title: "Recommendation", short: "R" }
       end
 
       def self.get_renderer_class

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

@@ -24,7 +24,7 @@ module Pubid::Iso
       end
 
       def self.type
-        { key: :sup, title: "Supplement", values: %w[Supplement Suppl SUP] }
+        { key: :sup, title: "Supplement", values: %w[Supplement Suppl SUP], short: "SUP" }
       end
 
       def self.get_renderer_class

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

@@ -8,7 +8,7 @@ module Pubid::Iso
       TYPED_STAGES = {}.freeze
 
       def self.type
-        { key: :tc, title: "Technical Committee" }
+        { key: :tc, title: "Technical Committee", short: "TC" }
       end
 
       def self.get_renderer_class

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

@@ -19,7 +19,7 @@ module Pubid::Iso
       }.freeze
 
       def self.type
-        { key: :tr, title: "Technical Report" }
+        { key: :tr, title: "Technical Report", short: "TR" }
       end
 
       def self.get_renderer_class

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

@@ -19,7 +19,7 @@ module Pubid::Iso
       }.freeze
 
       def self.type
-        { key: :ts, title: "Technical Specification" }
+        { key: :ts, title: "Technical Specification", short: "TS" }
       end
 
       def self.get_renderer_class

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

@@ -19,7 +19,7 @@ module Pubid::Iso
       }.freeze
 
       def self.type
-        { key: :tta, title: "Technology Trends Assessments" }
+        { key: :tta, title: "Technology Trends Assessments", short: "TTA" }
       end
 
       def self.get_renderer_class

data/lib/pubid/iso/parser.rb

@@ -169,9 +169,10 @@ 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 >>
+        (space >> str("DIR").as(:jtc_dir) >> (str(":") >> year).maybe).maybe >>
         (str(" -- Consolidated").maybe >> (str("").as(:mark) >> space? >>
           (organization.as(:publisher) >> space?).maybe >>
-          array_to_str(DIR_SUPPLEMENTS) >> (str(":") >> year).maybe >>
+          array_to_str(DIR_SUPPLEMENTS) >> (str(":") >> (year >> (dash >> month_digits.as(:month)).maybe)).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

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

@@ -0,0 +1,11 @@
+require_relative "base"
+
+module Pubid::Iso::Renderer
+  class Data < Base
+    TYPE = "DATA".freeze
+
+    def omit_post_publisher_symbol?(_typed_stage, _stage, _opts)
+      false
+    end
+  end
+end

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

@@ -4,7 +4,11 @@ module Pubid::Iso::Renderer
   class Dir < Base
 
     def render_identifier(params, opts)
-      res = ("%{publisher} DIR%{dirtype}%{number}%{year}%{edition}" % params)
+      if params.key?(:jtc_dir)
+        res = ("%{publisher}%{dirtype}%{number} DIR%{year}%{edition}" % params)
+      else
+        res = ("%{publisher} DIR%{dirtype}%{number}%{year}%{edition}" % params)
+      end
 
       if params.key?(:joint_document)
         joint_params = prerender_params(params[:joint_document].to_h(deep: false), {})

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

@@ -32,7 +32,7 @@ module Pubid::Iso::Renderer
 
       if self.class == Supplement
         if opts[:base_type] == :dir
-          "%{stage}%{publisher} SUP%{number}%{part}%{iteration}%{year}%{edition}" % params
+          "%{stage}%{publisher} SUP%{number}%{part}%{iteration}%{year}%{month}%{edition}" % params
         else
           # type_prefix = "/#{type_prefix}" unless type_prefix.empty?
           "/%{stage}#{type_prefix}%{number}%{part}%{iteration}%{year}%{edition}" % params
@@ -60,5 +60,9 @@ module Pubid::Iso::Renderer
     def render_edition(edition, opts, _params)
       " Edition #{edition}" if opts[:with_edition]
     end
+
+    def render_month(month, _opts, _params)
+      "-#{month}"
+    end
   end
 end

data/lib/pubid/iso/transformer.rb

@@ -114,6 +114,11 @@ module Pubid::Iso
       context.select { |k, v| k != :dir_joint_document }
     end
 
+    rule(jtc_dir: simple(:jtc_dir)) do |context|
+      context[:type] = "DIR"
+      context
+    end
+
     def self.convert_stage(code)
       russian_code = Pubid::Iso::Renderer::Base::TRANSLATION[:russian][:stage].key(code.to_s)
       return { stage: russian_code } if russian_code

data/lib/pubid/iso/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Iso
-    VERSION = "0.7.0".freeze
+    VERSION = "0.7.2".freeze
   end
 end

data/lib/pubid/iso.rb

@@ -30,6 +30,7 @@ require_relative "iso/identifier/technology_trends_assessments"
 require_relative "iso/identifier/international_workshop_agreement"
 require_relative "iso/identifier/extract"
 require_relative "iso/identifier/addendum"
+require_relative "iso/identifier/data"
 
 config = Pubid::Core::Configuration.new
 config.stages = YAML.load_file(File.join(File.dirname(__FILE__), "../../stages.yaml"))
@@ -50,7 +51,8 @@ config.types = [Pubid::Iso::Identifier::InternationalStandard,
                 Pubid::Iso::Identifier::TechnologyTrendsAssessments,
                 Pubid::Iso::Identifier::Guide,
                 Pubid::Iso::Identifier::Extract,
-                Pubid::Iso::Identifier::Addendum]
+                Pubid::Iso::Identifier::Addendum,
+                Pubid::Iso::Identifier::Data]
 config.type_names = { tr: {
                         long: "Technical Report",
                         short: "TR",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-iso
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-29 00:00:00.000000000 Z
+date: 2024-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -85,6 +85,7 @@ files:
 - lib/pubid/iso/identifier/amendment.rb
 - lib/pubid/iso/identifier/base.rb
 - lib/pubid/iso/identifier/corrigendum.rb
+- lib/pubid/iso/identifier/data.rb
 - lib/pubid/iso/identifier/directives.rb
 - lib/pubid/iso/identifier/extract.rb
 - lib/pubid/iso/identifier/guide.rb
@@ -103,6 +104,7 @@ files:
 - lib/pubid/iso/renderer/amendment.rb
 - lib/pubid/iso/renderer/base.rb
 - lib/pubid/iso/renderer/corrigendum.rb
+- lib/pubid/iso/renderer/data.rb
 - lib/pubid/iso/renderer/dir.rb
 - lib/pubid/iso/renderer/extract.rb
 - lib/pubid/iso/renderer/guide.rb