pubid-jis 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c0c791095c83e4b8722ee5231a32aaa67ef83bc79c7819010bc7b3b39896b86
-  data.tar.gz: 73e325a24c1e57418037c4d14b793029c6203122325a0af3baf9de358e59d86c
+  metadata.gz: 88ee1a41ec35829f8cc0a39617282a85572a7f875f13c308d61be3e2092f7db8
+  data.tar.gz: 52d5385816c7d15755dd2d62374dfc907d29a6dcaf2d9458dd579a7dce6a2bd4
 SHA512:
-  metadata.gz: 072776bc60700e55cf0ba6c34f8be8aabb368d93f388e78ca676a7483cc093c051178336370eb301a26797a8d74d9f8f2f026e3c92bc543abf34e2cd9b175b80
-  data.tar.gz: bbcf78001e99c6043dbcf41efc7c0df69612c6f449e75864a2da9de1d7fd7d1d459717c1b79c4917cd9812bfd6e68496f5fbb5bed54f13fb52b3a925b75e1a6c
+  metadata.gz: 132e289c49e53c6bc1395023974381a5999b6e0472b0953d2867cd27ac71d02b8ffb2b920d4119ef4f71f4dd54f9a8c7ac8a11e14c33bd7f77f50e07b4d8e363
+  data.tar.gz: 0fa47f3d6ab10728e320182db42dcadcee9b6eb61902f5994721e9fc7180913dddfe0a9f3e82d9f80f2b0fa30fea2bf4564cdfffb4cd0bd2ac4ed322f9df7463

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

@@ -44,7 +44,7 @@ module Pubid::Jis
         def transform_supplements(supplements_params, base_params)
           supplements = supplements_params.map do |supplement|
             Identifier.create(number: supplement[:number], year: supplement[:year],
-                              type: supplement[:type], base: Identifier.create(**base_params))
+                              type: :amd, base: Identifier.create(**base_params))
           end
 
           return supplements.first if supplements.count == 1
@@ -52,6 +52,10 @@ module Pubid::Jis
           raise Errors::SupplementParsingError, "more than one or none supplements provided"
         end
 
+        def transform_explanation(params, base_params)
+          Identifier.create(type: :explanation, base: Identifier.create(**base_params), **params)
+        end
+
         # Use Identifier#create to resolve identifier's type class
         def transform(params)
           identifier_params = params.map do |k, v|
@@ -65,6 +69,13 @@ module Pubid::Jis
             )
           end
 
+          if identifier_params[:explanation]
+            return transform_explanation(
+              identifier_params[:explanation].is_a?(Hash) ? identifier_params[:explanation] : {},
+              identifier_params.dup.tap { |h| h.delete(:explanation) }
+            )
+          end
+
           Identifier.create(**identifier_params)
         end
 

data/lib/pubid/jis/identifier/explanation.rb

@@ -0,0 +1,24 @@
+require_relative "../renderer/amendment"
+
+module Pubid::Jis
+  module Identifier
+    class Explanation < Base
+      attr_accessor :base
+
+      def_delegators 'Pubid::Jis::Identifier::Explanation', :type
+
+      def initialize(base: nil, number: nil, **opts)
+        super(**opts.merge(number: number))
+        @base = base
+      end
+
+      def self.type
+        { key: :explanation, title: "Explanation", short: "EXPL" }
+      end
+
+      def self.get_renderer_class
+        Renderer::Explanation
+      end
+    end
+  end
+end

data/lib/pubid/jis/parser.rb

@@ -35,12 +35,16 @@ module Pubid::Jis
     end
 
     rule(:amendment) do
-      (str("/") >> str("AMD").as(:type) >> space >> digits.as(:number) >> colon >> year).repeat(1).as(:supplements)
+      (str("/") >> (str("AMD") | str("AMENDMENT")).as(:type) >> space >> digits.as(:number) >> colon >> year).repeat(1).as(:supplements)
+    end
+
+    rule(:explanation) do
+      (str("/") >> (str("EXPLANATION") | str("EXPL")) >> (space >> digits.as(:number)).maybe).as(:explanation)
     end
 
     rule(:identifier) do
       str("JIS").maybe >> space? >> type.maybe >> space? >> series >> space? >> digits.as(:number) >> part >>
-        (colon >> year).maybe >> language.maybe >> all_parts.maybe >> amendment.maybe
+        (colon >> year).maybe >> language.maybe >> all_parts.maybe >> amendment.maybe >> explanation.maybe
     end
 
     rule(:root) { identifier }

data/lib/pubid/jis/renderer/amendment.rb

@@ -5,5 +5,9 @@ module Pubid::Jis::Renderer
     def render_identifier(params)
       "%{base}/AMD %{number}%{year}" % params
     end
+
+    def render_base(base, opts, _params)
+      base.to_s(**opts)
+    end
   end
 end

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

@@ -2,6 +2,10 @@ module Pubid::Jis::Renderer
   class Base < Pubid::Core::Renderer::Base
     TYPE = "".freeze
 
+    def render(**args)
+      render_base_identifier(**args) + @prerendered_params[:language].to_s
+    end
+
     def render_identifier(params)
       "%{publisher}%{series} %{number}%{part}%{year}%{all_parts}" % params
     end
@@ -15,7 +19,7 @@ module Pubid::Jis::Renderer
     end
 
     def render_part(part, opts, _params)
-      return "-#{part.reverse.join('-')}" if part.is_a?(Array)
+      return "-#{part.join('-')}" if part.is_a?(Array)
 
       "-#{part}"
     end
@@ -23,5 +27,9 @@ module Pubid::Jis::Renderer
     def render_all_parts(all_parts, _opts, _params)
       "（規格群）" if all_parts
     end
+
+    def render_year(year, _opts, _params)
+      ":#{year}"
+    end
   end
 end

data/lib/pubid/jis/renderer/explanation.rb

@@ -0,0 +1,13 @@
+require_relative "base"
+
+module Pubid::Jis::Renderer
+  class Explanation < Base
+    def render_identifier(params)
+      if params[:number].to_s.empty?
+        "%{base}/EXPL" % params
+      else
+        "%{base}/EXPL %{number}" % params
+      end
+    end
+  end
+end

data/lib/pubid/jis/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Jis
-    VERSION = "0.2.0".freeze
+    VERSION = "0.3.1".freeze
   end
 end

data/lib/pubid/jis.rb

@@ -12,16 +12,21 @@ require_relative "jis/identifier/base"
 require_relative "jis/identifier/technical_report"
 require_relative "jis/identifier/technical_specification"
 require_relative "jis/identifier/amendment"
+require_relative "jis/identifier/explanation"
 require_relative "jis/renderer/base"
 require_relative "jis/renderer/technical_report"
 require_relative "jis/renderer/technical_specification"
 require_relative "jis/renderer/amendment"
+require_relative "jis/renderer/explanation"
 require_relative "jis/parser"
 require_relative "jis/identifier"
 
 config = Pubid::Core::Configuration.new
 config.default_type = Pubid::Jis::Identifier::Base
-config.types = [Pubid::Jis::Identifier::Base, Pubid::Jis::Identifier::TechnicalReport,
-                Pubid::Jis::Identifier::TechnicalSpecification, Pubid::Jis::Identifier::Amendment]
+config.types = [Pubid::Jis::Identifier::Base,
+                Pubid::Jis::Identifier::TechnicalReport,
+                Pubid::Jis::Identifier::TechnicalSpecification,
+                Pubid::Jis::Identifier::Amendment,
+                Pubid::Jis::Identifier::Explanation]
 config.type_names = {}.freeze
 Pubid::Jis::Identifier.set_config(config)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-jis
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-06 00:00:00.000000000 Z
+date: 2023-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,48 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: lightly
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.8.6
 description: Library to generate, parse and manipulate JIS PubID.
 email:
 - open.source@ribose.com
@@ -125,11 +83,13 @@ files:
 - lib/pubid/jis/identifier.rb
 - lib/pubid/jis/identifier/amendment.rb
 - lib/pubid/jis/identifier/base.rb
+- lib/pubid/jis/identifier/explanation.rb
 - lib/pubid/jis/identifier/technical_report.rb
 - lib/pubid/jis/identifier/technical_specification.rb
 - lib/pubid/jis/parser.rb
 - lib/pubid/jis/renderer/amendment.rb
 - lib/pubid/jis/renderer/base.rb
+- lib/pubid/jis/renderer/explanation.rb
 - lib/pubid/jis/renderer/technical_report.rb
 - lib/pubid/jis/renderer/technical_specification.rb
 - lib/pubid/jis/version.rb
@@ -152,7 +112,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 JIS PubID.