pubid-iso 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 554740ba301fe225d6b7a58931013bb6d33d2c9ffa41de45c2b72b53b16340e7
-  data.tar.gz: ad603b65a477dbf70222252e0b286226d9dc576ff24fc794e9873fdea4a0a45e
+  metadata.gz: 5c7548bf553930fd483cab3fd09c4a23279ef230108587725c5cecb456e36885
+  data.tar.gz: eb037635c55d8f10068fb4a31ed4254e796c2c158a3b2553a643ee0e1794e8a0
 SHA512:
-  metadata.gz: 731c5b93d0c2a443a6d1af5c965d6eb4984279bb062d1bd3136436cf65044186332661cbc6ae51a0500131b1cc13204991c4ed8e211fe28937298db806c65817
-  data.tar.gz: 441fbee4c9481f6c60f7f25a7ea6256550dab0241c0fb1a048e3272eaab4b87ac1089c08d2f7a33dbd74d418151793193ee7e0d36143b8c46ac79594134b3fcf
+  metadata.gz: 830082c58902dfd2763afdf5d8809665f7eae31a8802b8bf290daa9cd6341a553782ed388415c3c6986b731abeb35371ceb4bbf362cd2e42aaacaa2c691f4593
+  data.tar.gz: 70c49c310c2ba7bba7a28027a7c96689d2129f7c0b1193390e81373dc901309248a21055e0ca0fd62290f1f2f919d4749c0c0142195ec46e9b77f1208e70ae92

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

@@ -12,9 +12,10 @@ 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
@@ -32,6 +33,7 @@ module Pubid::Iso
       # @param dirtype [String] Directives document type, eg. "JTC"
       # @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))
 
@@ -75,7 +77,9 @@ module Pubid::Iso
             @joint_document = joint_document
           end
         end
-        @tctype = tctype if tctype
+        if tctype
+          @tctype = tctype.is_a?(Array) ? tctype.map(&:to_s) : tctype.to_s
+        end
         @sctype = sctype.to_s if sctype
         @wgtype = wgtype.to_s if wgtype
         @tcnumber = tcnumber.to_s if tcnumber
@@ -83,6 +87,9 @@ module Pubid::Iso
         @wgnumber = wgnumber.to_s if wgnumber
         @dir = dir.to_s if dir
         @dirtype = dirtype.to_s if dirtype
+        if jtc_dir
+          @jtc_dir = jtc_dir
+        end
         if base
           if base.is_a?(Hash)
             @base = Identifier.create(**base)
@@ -90,9 +97,10 @@ module Pubid::Iso
             @base = base
           end
         end
-        @part = part if part
+        @part = part.to_s if part
         @addendum = addendum if addendum
         @edition = edition
+        @month = month
       end
 
       class << self
@@ -109,6 +117,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/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/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.1".freeze
+    VERSION = "0.7.3".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.1
+  version: 0.7.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-14 00:00:00.000000000 Z
+date: 2024-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 1.12.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 1.12.3
 description: Library to generate, parse and manipulate ISO PubID.
 email:
 - open.source@ribose.com
@@ -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