pubid-jis 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aaeab5258bdddf833c4ab9918d0973abfb23993ac3e6433b9fd73e4c9c6b2f6d
-  data.tar.gz: ef707e6ec8b8d989b2376a46266388c4a9fdb1f577b25b991accf56dcc772877
+  metadata.gz: 07eef4940f4a38e169eebcd786cb2d4456814c9bb0ab6eafba78eaf619dee42b
+  data.tar.gz: 6e42254073b7bcb5d8a00fc5c1d8c74d0a0ac116340f8b25ba6a77bbbc8b4de8
 SHA512:
-  metadata.gz: 450467f6397bad16e962d7b15628d1cb8b91d169cf5d6d76b551593b63a99df3a1910bfd415b97ac805964c6b31eb3ca76649f3c0c3d9caeb599fc1e55d4c1dc
-  data.tar.gz: 1a1ba91e716740b9d1e9b135a9c72e3dca0f351ce0682d9fc92bf763e3438df6d706be880f15f6e5f2821c14032c273ebe45de0c36d89ce02a681aadca7797d7
+  metadata.gz: e94361974bb9a05aa7613270dbe940afeb45909274d279c505fa4612cb292854cea31b46c28d280348867cda5c9a620fb3fa4218dd833be84f8061d02ba4e254
+  data.tar.gz: b29aa12e363a0536f5a31bf8bc336ccaedc7e83d6e9f3a7c9ceb6d99f5f621245bd514150828c91fdbaea0039ffadec96ea40e353598e8c9fd668a44dba7ba70

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

@@ -25,18 +25,26 @@ module Pubid::Jis
 
       def ==(other)
         if all_parts? || other.all_parts?
-          return get_params.reject { |k, _| [:part, :all_parts].include?(k) } ==
-            other.get_params.reject { |k, _| [:part, :all_parts].include?(k) }
+          return get_params.reject { |k, _| [:year, :part, :all_parts].include?(k) } ==
+            other.get_params.reject { |k, _| [:year, :part, :all_parts].include?(k) }
         end
 
         super
       end
 
+      # @param with_publisher [Boolean] add publisher to output
+      def to_s(with_publisher: true)
+        options = {}
+        options[:with_publisher] = with_publisher
+
+        self.class.get_renderer_class.new(get_params).render(**options)
+      end
+
       class << self
         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
@@ -44,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|
@@ -57,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,12 +2,20 @@ 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
 
-    def render_series(series, _opts, _params)
-      " #{series}"
+    def render_publisher(publisher, opts, params)
+      super if opts[:with_publisher]
+    end
+
+    def render_series(series, opts, _params)
+      opts[:with_publisher] ? " #{series}" : series
     end
 
     def render_part(part, opts, _params)
@@ -19,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.1.1".freeze
+    VERSION = "0.3.0".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.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-01 00:00:00.000000000 Z
+date: 2023-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -125,11 +125,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