pubid-iec 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e57bcfb0e8b8e333e16b5fae2f8103cc7fb3c755717f55afd485f5d100931e4
-  data.tar.gz: 57af222f9db3651ec847af8b5b21ec0715eeadf0883df955de4cc69ccf2b7b72
+  metadata.gz: 134c88cd97b9f01cb400274bf68da78d3b32dfb376a075a5917a50275c54436a
+  data.tar.gz: 295a46cd51f15c8d2c5be73e2cdda9b74ef35cbc69d93045ff1e45e22f319bae
 SHA512:
-  metadata.gz: bcb6be5089d7225c204df7209102cb429e13eebaf4782097edfc664a588e536d19dfdbd4d3f8bc2e27e8456772c996c7fb5dd1ceb59f47e1400f7fd0627c55ca
-  data.tar.gz: 838eb82be8b4385f99f028e87fcf301b7f128901369309adaffaee00ec245e36132581111f658b60e66aae6a3b448ccd3571d7cbcb8f3f447895823aff836d1b
+  metadata.gz: 413c4a52be16b94e4afa98991b08bc20ec97f302612aa9b00677a94ccf682b94dd053ba3d672e5bbb2e6f8c07696e1435d39aba99133874121a082081599690b
+  data.tar.gz: 1355b18c8e905925d58a77375c7765b0bcbbb9477f57858d88b7059dcae7709cac7dc7598190881d1e26d552c091136c6c38b7725280cfa5a122d84578e73f50

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

@@ -5,7 +5,7 @@ module Pubid::Iec
 
     attr_accessor :vap, :database, :fragment, :version, :decision_sheet,
                   :conjuction_part, :part_version, :trf_publisher,
-                  :trf_series, :trf_version, :test_type, :month, :day
+                  :trf_series, :trf_version, :test_type, :month, :day, :sheet
 
     extend Forwardable
 
@@ -17,7 +17,7 @@ module Pubid::Iec
                    conjuction_part: nil, part_version: nil, trf_publisher: nil,
                    trf_series: nil, trf_version: nil, test_type: nil,
                    edition: nil, type: nil, month: nil, day: nil,
-                   language: nil, stage: nil, **args)
+                   language: nil, stage: nil, sheet: nil, **args)
 
       @vap = vap.to_s if vap
       @database = database if database
@@ -34,6 +34,7 @@ module Pubid::Iec
       @month = month if month
       @day = day if day
       @language = language if language
+      @sheet = sheet if sheet
 
       if stage
         @stage = self.class.has_project_stage?(stage) ? self.class.resolve_project_stage(stage) : resolve_stage(stage)

data/lib/pubid/iec/parser.rb

@@ -17,7 +17,7 @@ module Pubid::Iec
 
     rule(:part) do
       (str("-") | str("/")) >> space? >>
-        (str("Amd") | str("Cor")).absent? >> (match['[\dA-Z]'] | str("-")).repeat(1).as(:part)
+        (str("Amd") | str("Cor")).absent? >> (match['[\dA-Za-z]'] | str("-")).repeat(1).as(:part)
     end
 
     rule(:version) { digits >> (dot >> digits).maybe }
@@ -41,6 +41,11 @@ module Pubid::Iec
         (str(":") >> digits.as(:year)).maybe).as(:interpretation_sheet)
     end
 
+    rule(:sheet) do
+      (str("/") >> digits.as(:number) >> (str(":") >>
+        digits.as(:year)).maybe).as(:sheet)
+    end
+
     rule(:fragment) do
       (str("/") >> str("FRAG") >> match('[\dA-Z]').repeat(1).as(:fragment)).maybe
     end
@@ -59,7 +64,7 @@ module Pubid::Iec
     rule(:number) do
       (digits | str("SYMBOL") | str("SYCSMARTENERGY") | str("SyCLVDC") |
         str("SYCLVDC") | str("SyCCOMM") | str("SyCAAL") | str("VIM") | match("[A-Za-z0-9 ]").repeat) >>
-        ((str(":") >> match("[A-Z]").repeat(1)) | match("[A-Z]")).maybe
+        ((str(":") >> match("[A-Z]").repeat(1)) | match("[a-zA-Z]")).maybe
     end
 
     rule(:std_document_body) do
@@ -69,8 +74,8 @@ module Pubid::Iec
         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 >>
+          (str("-") >> day_digits.as(:day)).maybe).maybe).maybe >> sheet.maybe >>
+        ((amendment >> vap.maybe >> corrigendum.maybe) | corrigendum).repeat >>
         interpretation_sheet.maybe >> fragment.maybe
     end
 

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

@@ -3,7 +3,7 @@ module Pubid::Iec::Renderer
     def render_identifier(params)
       "%{publisher}%{type}%{typed_stage}%{stage} %{number}%{part}%{conjuction_part}"\
       "%{part_version}%{version}%{iteration}"\
-      "%{year}%{month}%{day}%{amendments}%{corrigendums}%{fragment}%{vap}%{edition}%{database}" % params
+      "%{year}%{month}%{day}%{sheet}%{amendments}%{corrigendums}%{fragment}%{vap}%{edition}%{database}" % params
     end
     def render_typed_stage(typed_stage, _opts, _params)
       " #{typed_stage}"
@@ -29,6 +29,10 @@ module Pubid::Iec::Renderer
       "/FRAG#{fragment}"
     end
 
+    def render_sheet(sheet, _opts, _params)
+      "/#{sheet[:number]}" + (sheet[:year] ? ":#{sheet[:year]}" : "")
+    end
+
     def render_database(database, _opts, _params)
       " DB" if database
     end

data/lib/pubid/iec/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Iec
-    VERSION = "0.3.0".freeze
+    VERSION = "0.3.2".freeze
   end
 end

data/update_codes.yaml

@@ -57,3 +57,7 @@ IECEE TRF 60730-1HSOF:2014: IECEE TRF 60730-1H_SOF:2014
 IECEE TRF 60730-1HEMC:2014: IECEE TRF 60730-1H_EMC:2014
 IECEE TRF 60730-2-1IEMC:2019: IECEE TRF 60730-2-1I_EMC:2019
 IECEE TRF 60601-1-2CEMC:2011: IECEE TRF 60601-1-2C_EMC:2011
+"CISPR 14-2:2015/AMD1/FRAG3:": CISPR 14-2:2015/AMD1/FRAG3 ED2
+"IEC 60309-3:1994/FRAG1:": IEC 60309-3:1994/FRAG1 ED1
+"CISPR 14-1:2016/AMD1/FRAG5:": CISPR 14-1:2016/AMD1/FRAG5 ED5
+"IEC 60285-/1:1989": IEC 60285-1:1989

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-iec
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2024-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -143,7 +143,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 IEC PubID.