pubid-cen 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e1da29b88d15117361e26282da95f073c8027ff11e82b1dc2e68a8e5481231f
-  data.tar.gz: 4e262d7c9e52228f282e82b794d6036a7fdf85d59854fa6be1025da067af54ed
+  metadata.gz: 670ef1b7391c8d5b2f576a67f7da3f3320094778302898603ee9fb819d5d8b8e
+  data.tar.gz: bb1aa27c00811ad9b111da9c97f0f3b9190cc328b632361ed1314c36a26541e0
 SHA512:
-  metadata.gz: 210ce4b95af59951c42d34cadfafe657b07af6ea3fe29bf7a3c82453fb7c0e4552b1f4f04e26f1852ae9b7e0785ed94e386743da07ff2f0b3641b31c3496602e
-  data.tar.gz: c6f3e4cc992bb794e619d30bf9eef992f5bddb5dc7dd1c91f7675439db78ed5e62a7103b3ad444385a2e11a14db985a5d8483920c113345a064940f192580877
+  metadata.gz: 94795c4877fcf2d970377ce2455fda3f8abda4b54bd31f203d692fa1e1f9bae1fe00203f7623e343810c41ac372215727f166a22d62b6b04bd225f51dbe7f9ab
+  data.tar.gz: 21bd2bd896f9ad6de4fe3f9b8f9fa1e5ace3c2186e758d691a23172c6951b95b6b650afd8769445268c47e6f18222ca262c66373347a484c57e675da3caa4e46

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

@@ -4,8 +4,7 @@ module Pubid::Cen
   module Identifier
     class Base < Pubid::Core::Identifier::Base
       extend Forwardable
-
-      attr_accessor :supplements
+      attr_accessor :supplements, :adopted
 
       def self.type
         { key: :en, title: "European Norm" }
@@ -13,11 +12,13 @@ module Pubid::Cen
 
       # @param month [Integer] document's month
       # @param edition [String] document's edition version, e.g. "3.0", "1.0"
-      def initialize(publisher: "EN", part: nil, stage: nil, incorporated_supplements: nil, **opts)
-        super(**opts.merge(publisher: publisher))
+      def initialize(number: nil, publisher: "EN", part: nil, stage: nil,
+                     incorporated_supplements: nil, adopted: nil, **opts)
+        super(**opts.merge(publisher: publisher, number: number))
         @part = part if part
         @stage = Identifier.parse_stage(stage) if stage
         @supplements = incorporated_supplements
+        @adopted = adopted
       end
 
       class << self

data/lib/pubid/cen/identifier/corrigendum.rb

@@ -4,8 +4,8 @@ module Pubid::Cen
       def_delegators 'Pubid::Cen::Identifier::Corrigendum', :type
       attr_accessor :base
 
-      def initialize(number: nil, base: nil, **opts)
-        super(**opts.merge(number: number))
+      def initialize(base: nil, **opts)
+        super(**opts)
         @base = base
       end
 

data/lib/pubid/cen/parser.rb

@@ -38,8 +38,14 @@ module Pubid::Cen
     end
 
     rule(:identifier) do
-      stage.maybe >> originator.maybe >> type.maybe >> space >> digits.as(:number) >> part >>
-        (str(":") >> year).maybe >> supplement.maybe >> incorporated_supplement.repeat
+      stage.maybe >> originator.maybe >> ((type.maybe >> space >> digits.as(:number) >> part >>
+        (str(":") >> year).maybe) | (space >> (match("[^+/]").repeat(1) >>
+        # XXX: hack to match part after "/" for identifiers like
+        # EN ISO/IEC 80079-34:2020 ED2
+        # but march only part before "/" for identifiers like
+        # EN ISO 13485:2016/AC:2016
+        (supplement.absent? >> match("[^+]").repeat(1)).maybe).as(:adopted))) >>
+        supplement.maybe >> incorporated_supplement.repeat
     end
 
     rule(:root) { identifier }

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

@@ -1,6 +1,8 @@
 module Pubid::Cen::Renderer
   class Base < Pubid::Core::Renderer::Base
     def render_identifier(params)
+      return "%{publisher} %{adopted}%{supplements}" % params unless params[:adopted].to_s.empty?
+
       "%{stage}%{publisher}%{type} %{number}%{part}%{year}%{supplements}" % params
     end
 

data/lib/pubid/cen/transformer.rb

@@ -19,6 +19,12 @@ module Pubid::Cen
       context
     end
 
+    rule(adopted: subtree(:adopted)) do |context|
+      { adopted: Pubid::Iec::Identifier.parse(context[:adopted].to_s) }
+    rescue Pubid::Core::Errors::ParseError
+      { adopted: Pubid::Iso::Identifier.parse(context[:adopted].to_s) }
+    end
+
     def self.convert_supplement(supplement)
       case supplement[:type]
       when "A"

data/lib/pubid/cen/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Cen
-    VERSION = "0.1.1".freeze
+    VERSION = "0.2.1".freeze
   end
 end

data/lib/pubid/cen.rb

@@ -6,6 +6,8 @@ module Pubid
 end
 
 require "pubid-core"
+require "pubid-iso"
+require "pubid-iec"
 
 require_relative "cen/errors"
 require_relative "cen/transformer"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-cen
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-02 00:00:00.000000000 Z
+date: 2023-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,6 +108,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: pubid-iso
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+- !ruby/object:Gem::Dependency
+  name: pubid-iec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 description: Library to generate, parse and manipulate CEN PubID.
 email:
 - open.source@ribose.com