pubid-itu 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b6a9f43860cc646babf95c556cf4aa0169f847a26415503bfa0458dd0af9af1
-  data.tar.gz: 6e5c30a16a55c467bb5b1d4ce00c2e6bbc7dec182b5e40815c8e8146669a10a7
+  metadata.gz: 4b5ede4e5121a3af045e2b6459a59f540449c7c68cd167ab2941b00c793668ed
+  data.tar.gz: 51a94e41094937353557a316b72dd1fb7fb44a7a14f4efc5dbc17ed61e06c35f
 SHA512:
-  metadata.gz: 4049ed45d386a01a4670397674340e7c287186399c4e4b417e54b21b902b4518cc5c8660b081ee1f53e6a9cc08d947cbb7a9a0730fd7d17e0cd04aed367ec94d
-  data.tar.gz: c6fd2a5ad473a2325063b1112f578376d8a01947ddfdca133113a420a8357b2bdbd670b2583239ee70959fe41b80bf868dfd48e22b63215affa379d2ee55065d
+  metadata.gz: 32adffd9092c1ded6b651e39a8093a578cc26f13ad2fadd7e59219b88fa6a548074718195957f411a3e95bbd5e409b227dc09789d18aa403ec673af25485000b
+  data.tar.gz: 07aec0fd86e6dd91ec5503eb878d43b05a01dcdf253ecbb2ed95053387d580a7321caef6d738a7a41e76192e839dadda3b6b54c954271fc693e7a596bbc04d5b

data/i18n.yaml

@@ -0,0 +1,13 @@
+publisher:
+  ITU:
+    ru: МСЭ
+    es: UIT
+    fr: UIT
+
+type:
+  REC:
+    ru: Рек.
+    es: Rec.
+    fr: Rec.
+    cn: 建议书
+    ar: "التوصية"

data/lib/pubid/itu/identifier/annex.rb

@@ -3,6 +3,13 @@ module Pubid::Itu
     class Annex < Supplement
       def_delegators 'Pubid::Itu::Identifier::Annex', :type
 
+      attr_accessor :base
+
+      def initialize(base: nil, **opts)
+        super(**opts)
+        @base = base
+      end
+
       def self.type
         { key: :annex, title: "Annex" }
       end

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

@@ -47,12 +47,19 @@ module Pubid::Itu
         end
 
         def transform_supplements(type, identifier_params)
-          Identifier.create(
-            type: type,
-            base: transform(
-              **identifier_params.dup.tap { |h| h.delete(type) }),
-            **identifier_params[type],
-          )
+          if identifier_params[type].is_a?(Hash)
+            Identifier.create(
+              type: type,
+              base: transform(
+                **identifier_params.dup.tap { |h| h.delete(type) }),
+              **identifier_params[type],
+            )
+          else
+            Identifier.create(
+              type: type,
+              base: transform(**identifier_params.dup.tap { |h| h.delete(type) })
+            )
+          end
         end
 
         # Use Identifier#create to resolve identifier's type class

data/lib/pubid/itu/identifier/contribution.rb

@@ -0,0 +1,15 @@
+module Pubid::Itu
+  module Identifier
+    class Contribution < Base
+      def_delegators 'Pubid::Itu::Identifier::Contribution', :type
+
+      def self.type
+        { key: :contribution, title: "Contribution" }
+      end
+
+      def self.get_renderer_class
+        Renderer::Contribution
+      end
+    end
+  end
+end

data/lib/pubid/itu/identifier/question.rb

@@ -4,7 +4,7 @@ module Pubid::Itu
       def_delegators 'Pubid::Itu::Identifier::Question', :type
 
       def self.type
-        { key: :question, title: "Question" }
+        { key: :question, title: "Question", short: :question }
       end
     end
   end

data/lib/pubid/itu/identifier/resolution.rb

@@ -4,7 +4,7 @@ module Pubid::Itu
       def_delegators 'Pubid::Itu::Identifier::Resolution', :type
 
       def self.type
-        { key: :resolution, title: "Resolition" }
+        { key: :resolution, title: "Resolition", short: :resolution }
       end
     end
   end

data/lib/pubid/itu/identifier.rb

@@ -9,7 +9,7 @@ module Pubid::Itu
       end
 
       def resolve_identifier(parameters = {})
-        return Question.new(**parameters) if parameters[:series].to_s.match?(/^SG/)
+        return Question.new(**parameters) if parameters[:series].to_s.match?(/^SG/) && !parameters[:type]
 
         return Resolution.new(**parameters) if parameters[:series].to_s == "R"
 

data/lib/pubid/itu/parser.rb

@@ -88,6 +88,10 @@ module Pubid::Itu
       space >> str("Annex") >> space >> (match["A-Z"] >> digits.maybe >> str("+").maybe).as(:number).as(:annex)
     end
 
+    rule(:annex_to) do
+      str("Annex to ").as(:annex)
+    end
+
     rule(:corrigendum) do
       (published >> space >> str("Cor.") >> space >>
         digits.as(:number)).as(:corrigendum)
@@ -107,7 +111,7 @@ module Pubid::Itu
     end
 
     rule(:identifier) do
-      str("ITU") >> (dash | space) >> sector_series_number >> supplement.maybe >>
+      annex_to.maybe >> str("ITU") >> (dash | space) >> sector_series_number >> supplement.maybe >>
         annex.maybe >> corrigendum.maybe >> addendum.maybe >> appendix.maybe >>
         published.maybe >> amendment.maybe >> str("-I").maybe >> language.maybe
     end

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

@@ -10,14 +10,48 @@ module Pubid::Itu::Renderer
       "%{type}%{series}" % params
     end
 
-    def render_identifier(params)
-      "%{publisher}-%{sector} #{render_type_series(params)}%{number}%{subseries}"\
+    def render_base_identifier(**args)
+      prerender(**args)
+
+      # pass args to render_identifier
+      render_identifier(@prerendered_params, args)
+    end
+
+    # can prepend entity, can postpend, can use item holder
+
+    def render_identifier(params, opts)
+      postfix = prefix = ""
+      if @params[:annex] && @params[:annex][:number].nil?
+        prefix += "Annex to "
+      elsif opts[:language] &&
+          (type_translation = Pubid::Itu::I18N["type"][@params[:type]]&.fetch(opts[:language].to_s, nil))
+        if opts[:language] == :cn
+          postfix =+ type_translation
+        elsif opts[:language] == :ar
+          postfix += " #{type_translation}"
+        else
+          prefix += "#{type_translation} "
+        end
+      end
+
+      "#{prefix}%{publisher}-%{sector} #{render_type_series(params)}%{number}%{subseries}"\
       "%{part}%{second_number}%{range}%{annex}%{amendment}%{corrigendum}%{supplement}"\
-      "%{addendum}%{appendix}%{date}" % params
+      "%{addendum}%{appendix}%{date}#{postfix}" % params
+    end
+
+    def render_publisher(publisher, opts, params)
+      if opts[:language] &&
+          (publisher_translation = Pubid::Itu::I18N["publisher"][publisher]&.fetch(opts[:language].to_s, nil))
+        return super(publisher_translation, opts, params)
+      end
+
+      super
     end
 
     def render_number(number, _opts, params)
-      params[:series] ? ".#{number}" : number
+      return " No. #{number}" if params[:series] == "OB"
+
+      number
     end
 
     def render_date(date, opts, _params)
@@ -38,8 +72,8 @@ module Pubid::Itu::Renderer
       "-#{part}"
     end
 
-    def render_series(series, _opts, _params)
-      "#{series}"
+    def render_series(series, _opts, params)
+      series + (params[:series] != "OB" && params[:number] ? "." : "")
     end
 
     def render_amendment(amendment, _opts, _params)
@@ -67,7 +101,7 @@ module Pubid::Itu::Renderer
     end
 
     def render_annex(annex, _opts, _params)
-      " Annex #{annex[:number]}"
+      " Annex #{annex[:number]}" if annex[:number]
     end
 
     def render_corrigendum(corrigendum, opts, params)

data/lib/pubid/itu/renderer/contribution.rb

@@ -0,0 +1,15 @@
+module Pubid::Itu::Renderer
+  class Contribution < Base
+    def render_identifier(params, _opts)
+      ("%{series}-C%{number}" % params)
+    end
+
+    def render_series(series, _opts, _params)
+      series
+    end
+
+    def render_number(number, _opts, params)
+      number
+    end
+  end
+end

data/lib/pubid/itu/renderer/implementers_guide.rb

@@ -1,7 +1,7 @@
 module Pubid::Itu::Renderer
   class ImplementersGuide < Base
     def render_type_series(params)
-      ("%{series}" % params) + (params[:series] ? ".Imp" : "Imp")
+      ("%{series}Imp" % params)
     end
 
     def render_number(number, _opts, params)

data/lib/pubid/itu/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Itu
-    VERSION = "0.1.2".freeze
+    VERSION = "0.1.3".freeze
   end
 end

data/lib/pubid/itu.rb

@@ -13,6 +13,8 @@ module Pubid
       "es": "S",
       "zh": "C",
     }.freeze
+
+    I18N = YAML.load_file(File.join(File.dirname(__FILE__), "../../i18n.yaml"))
   end
 end
 
@@ -32,9 +34,11 @@ require_relative "itu/identifier/annex"
 require_relative "itu/identifier/corrigendum"
 require_relative "itu/identifier/addendum"
 require_relative "itu/identifier/appendix"
+require_relative "itu/identifier/contribution"
 require_relative "itu/transformer"
 require_relative "itu/renderer/base"
 require_relative "itu/renderer/implementers_guide"
+require_relative "itu/renderer/contribution"
 require_relative "itu/parser"
 require_relative "itu/identifier"
 require_relative "itu/configuration"
@@ -53,7 +57,8 @@ config.types = [Pubid::Itu::Identifier::Base,
                 Pubid::Itu::Identifier::Supplement,
                 Pubid::Itu::Identifier::Annex,
                 Pubid::Itu::Identifier::Addendum,
-                Pubid::Itu::Identifier::Appendix]
+                Pubid::Itu::Identifier::Appendix,
+                Pubid::Itu::Identifier::Contribution]
 config.type_names = {}.freeze
 config.series = YAML.load_file(File.join(File.dirname(__FILE__), "../../series.yaml"))
 Pubid::Itu::Identifier.set_config(config)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-itu
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-29 00:00:00.000000000 Z
+date: 2024-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -77,6 +77,7 @@ extra_rdoc_files:
 files:
 - LICENSE.txt
 - README.adoc
+- i18n.yaml
 - lib/pubid-itu.rb
 - lib/pubid/itu.rb
 - lib/pubid/itu/configuration.rb
@@ -87,6 +88,7 @@ files:
 - lib/pubid/itu/identifier/annex.rb
 - lib/pubid/itu/identifier/appendix.rb
 - lib/pubid/itu/identifier/base.rb
+- lib/pubid/itu/identifier/contribution.rb
 - lib/pubid/itu/identifier/corrigendum.rb
 - lib/pubid/itu/identifier/implementers_guide.rb
 - lib/pubid/itu/identifier/question.rb
@@ -97,6 +99,7 @@ files:
 - lib/pubid/itu/identifier/supplement.rb
 - lib/pubid/itu/parser.rb
 - lib/pubid/itu/renderer/base.rb
+- lib/pubid/itu/renderer/contribution.rb
 - lib/pubid/itu/renderer/implementers_guide.rb
 - lib/pubid/itu/transformer.rb
 - lib/pubid/itu/version.rb
@@ -120,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Library to generate, parse and manipulate ITU PubID.