pubid-iec 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 521c15388c33bc8ce5118ea7e5d68a917882feeb638a452f2fa45006fc8fe04c
-  data.tar.gz: c18933a40936ece254eacc2f9882ce895c359bacc9cadf126abfaa9b154356f5
+  metadata.gz: 1873b70daa92fcd0ca9a5a4db60a23bf2e7ec228f2036f1a81a06a589f3e5c67
+  data.tar.gz: b01fc14aeed19ecae83b61a7ad57c9899c584ca88a4d5144dc4db0a39a6abbc8
 SHA512:
-  metadata.gz: 138da54cbfd8cfae1776ad28487a4d30ca70150df77bbc8bbdaf555d6958dad7519c032b9241adc9a78cef5fee835e8cbbe88b1e34d841a003a46add8dd9812f
-  data.tar.gz: fea398c22600418dab178a50667961cc81b9b14e492976d797b34f931df45193eda531be158a74bb6e07a1aa62945b574fa7efd548fd4ff391284943b4e2d766
+  metadata.gz: a84aede1cc1d76a1fe2e59d7d944e05e9ea087d3687616b9331be21625b103fb1be16645fcada73869b197b2e8b27b5ddd843546fbc819508a9e08185881625b
+  data.tar.gz: 9c397e13902622f6bcbd4b18984c74d814f10005269e32938838580ec1774ed8088ce9b54622d25c497091789702d46c614634dc09662c3a85e77083806a5576

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

@@ -83,6 +83,16 @@ module Pubid::Iec
       def transform(params)
         identifier_params = transform_hash(params)
 
+        if identifier_params[:interpretation_sheet]
+          return Identifier.create(
+            type: :ish,
+            base: Identifier.create(
+              **identifier_params.dup.tap { |h| h.delete(:interpretation_sheet) }),
+            number: identifier_params[:interpretation_sheet][:number],
+            year: identifier_params[:interpretation_sheet][:year]
+          )
+        end
+
         Identifier.create(**identifier_params)
       end
 

data/lib/pubid/iec/identifier/interpretation_sheet.rb

@@ -31,12 +31,17 @@ module Pubid::Iec
         },
       }.freeze
 
+      def initialize(base: nil, **opts)
+        super(**opts)
+        @base = base
+      end
+
       def self.type
         { key: :ish, title: "InterpretationSheet", short: "ISH" }
       end
 
-      def get_params
-        super.merge(type: "ISH")
+      def self.get_renderer_class
+        Renderer::InterpretationSheet
       end
     end
   end

data/lib/pubid/iec/parser.rb

@@ -35,6 +35,12 @@ module Pubid::Iec
         (str(":") >> digits.as(:year)).maybe).as(:amendments)
     end
 
+    rule(:interpretation_sheet) do
+      (str("/") >> str("ISH") >>
+        digits.as(:number) >>
+        (str(":") >> digits.as(:year)).maybe).as(:interpretation_sheet)
+    end
+
     rule(:fragment) do
       (str("/") >> str("FRAG") >> match('[\dA-Z]').repeat(1).as(:fragment)).maybe
     end
@@ -57,15 +63,15 @@ module Pubid::Iec
     end
 
     rule(:std_document_body) do
-      (type >> space).maybe >>
-        number.as(:number) >>
+      ((str("/") | space) >> type).maybe >>
+        space >> number.as(:number) >>
         edition.maybe >>
         part.maybe >>
         conjuction_part.maybe >>
         (space? >> str(":") >> year >> (str("-") >> month_digits.as(:month) >>
           (str("-") >> day_digits.as(:day)).maybe).maybe).maybe >>
         ((amendment >> corrigendum.maybe) | corrigendum).repeat >>
-        fragment.maybe
+        interpretation_sheet.maybe >> fragment.maybe
     end
 
     rule(:vap) do
@@ -84,7 +90,7 @@ module Pubid::Iec
     end
 
     rule(:identifier) do
-      (originator.maybe >> (space.maybe >> stage.as(:stage)).maybe >> (space | str("/")) >>
+      (originator.maybe >> (space.maybe >> stage.as(:stage)).maybe >>
         std_document_body >>
         vap.maybe >> database.maybe >>
         edition.maybe >>

data/lib/pubid/iec/renderer/interpretation_sheet.rb

@@ -0,0 +1,17 @@
+module Pubid::Iec::Renderer
+  class InterpretationSheet < Pubid
+    def render_identifier(params)
+      type_prefix = params[:typed_stage].nil? || params[:typed_stage].empty? ? "ISH" : ""
+
+      "%{base}/%{typed_stage}#{type_prefix}%{number}%{year}" % params
+    end
+
+    def render_typed_stage(typed_stage, _opts, _params)
+      typed_stage
+    end
+
+    def render_year(year, _opts, _params)
+      ":#{year}"
+    end
+  end
+end

data/lib/pubid/iec/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Iec
-    VERSION = "0.2.4".freeze
+    VERSION = "0.2.5".freeze
   end
 end

data/lib/pubid/iec.rb

@@ -18,6 +18,7 @@ require_relative "iec/renderer/urn"
 require_relative "iec/renderer/trf_urn"
 require_relative "iec/renderer/working_document"
 require_relative "iec/renderer/working_document_urn"
+require_relative "iec/renderer/interpretation_sheet"
 require_relative "iec/transformer"
 require_relative "iec/identifier/base"
 require_relative "iec/identifier/international_standard"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-iec
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2023-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -103,6 +103,7 @@ files:
 - lib/pubid/iec/parser.rb
 - lib/pubid/iec/renderer/amendment.rb
 - lib/pubid/iec/renderer/corrigendum.rb
+- lib/pubid/iec/renderer/interpretation_sheet.rb
 - lib/pubid/iec/renderer/pubid.rb
 - lib/pubid/iec/renderer/trf_pubid.rb
 - lib/pubid/iec/renderer/trf_urn.rb