pubid-bsi 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8301f114cdb297b45e6c558830ebc198b8fe688c871610f09feb18a758213521
-  data.tar.gz: ad2e418836fea9ee47494c75a43006cc5d32d4ed795b39f39a5ff419db9c7383
+  metadata.gz: bdf480ac6bf4dbd931083f12b08fd6cff1bb92ef22efde2a19bc224b0cd31210
+  data.tar.gz: 3f7db131a28ad7162f6973faf6be1d0fff9499b27a5a78daf4b1bf47495aaf89
 SHA512:
-  metadata.gz: 68a2ab714684c24481819a353529a69bdb1f891395a9ce61915610d14860ad0b3b552e4bdf26e3ff84dbff7a17bd951631c19e8f260c15c2883479793fda2d1f
-  data.tar.gz: 4d8215a02e26eee04cd7240f2351ac089ab19117a6e100725045b6b79f555369ae4b8f242e27abbb661384b08e3fa0c0a6d80cb22334ff4e995b29d3602e34b1
+  metadata.gz: c8a8295cef8551270b33ae2c5eb56209fa7f8742cf7fdbb90855750fd0786d313b835e81a12b5bd0df08d8811935069e4b47e90efa8cb8493d2faee51323d248
+  data.tar.gz: 7a9147d773e5da21eaf335aa16182506fc7459f1cbd2eef190555b0ef41aac2f2d8e550ff746645b7e2a647cb7df3eb81cd91db38572de9c49290ce51705873d

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

@@ -43,9 +43,21 @@ module Pubid::Bsi
 
           return transform_expert_commentary(identifier_params) if identifier_params[:expert_commentary]
 
+          return transform_collection(identifier_params) if identifier_params[:second_number]
+
           Identifier.create(**identifier_params)
         end
 
+        def transform_collection(params)
+          first_identifier_params =
+            params.reject { |k, _| %i[second_number year supplement].include?(k) }
+          second_identifier_params = first_identifier_params.dup
+          second_identifier_params[:number] = params[:second_number]
+          Collection.new(identifiers: [Identifier.create(**first_identifier_params),
+                                       Identifier.create(**second_identifier_params)],
+                         **params.slice(:supplement, :year))
+        end
+
         def transform_expert_commentary(base_params)
           Identifier.create(type: :ec,
                             base: Identifier.create(**base_params))

data/lib/pubid/bsi/identifier/collection.rb

@@ -0,0 +1,22 @@
+module Pubid::Bsi
+  module Identifier
+    class Collection < Base
+      def_delegators 'Pubid::Bsi::Identifier::Collection', :type
+
+      attr_accessor :identifiers
+
+      def initialize(identifiers:, **args)
+        @identifiers = identifiers
+        super(publisher: nil, number: nil, **args)
+      end
+
+      def self.type
+        { key: :collection, title: "Collection" }
+      end
+
+      def to_s
+        Renderer::Collection.new(get_params).render
+      end
+    end
+  end
+end

data/lib/pubid/bsi/parser.rb

@@ -44,10 +44,14 @@ module Pubid::Bsi
       space >> str("PDF").as(:pdf)
     end
 
+    rule(:second_number) do
+      str("/") >> digits.as(:second_number)
+    end
+
     rule(:identifier) do
       str("BSI ").maybe >> type >> space >>
         (
-          (digits.as(:number) >> part.maybe >> (space >> edition).maybe >>
+          (digits.as(:number) >> second_number.maybe >> part.maybe >> (space >> edition).maybe >>
             (space? >> str(":") >> year >> (dash >> month_digits.as(:month)).maybe).maybe) |
             # exclude expert_commentary and translation from adopted scope
             (expert_commentary.absent? >> translation.absent? >> space? >>

data/lib/pubid/bsi/renderer/collection.rb

@@ -0,0 +1,15 @@
+module Pubid::Bsi::Renderer
+  class Collection < Pubid::Core::Renderer::Base
+    def render_identifier(params)
+      "%{identifiers}%{year}%{supplement}" % params
+    end
+
+    def render_supplement(supplement, _opts, _params)
+      supplement.to_s
+    end
+
+    def render_identifiers(identifiers, _opts, _params)
+      "#{identifiers.first}/" + identifiers[1..-1].map(&:number).join("/")
+    end
+  end
+end

data/lib/pubid/bsi/version.rb

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

data/lib/pubid/bsi.rb

@@ -22,6 +22,7 @@ require_relative "bsi/identifier/amendment"
 require_relative "bsi/identifier/corrigendum"
 require_relative "bsi/identifier/national_annex"
 require_relative "bsi/identifier/expert_commentary"
+require_relative "bsi/identifier/collection"
 require_relative "bsi/renderer/base"
 require_relative "bsi/renderer/publicly_available_specification"
 require_relative "bsi/renderer/published_document"
@@ -31,6 +32,7 @@ require_relative "bsi/renderer/amendment"
 require_relative "bsi/renderer/corrigendum"
 require_relative "bsi/renderer/national_annex"
 require_relative "bsi/renderer/expert_commentary"
+require_relative "bsi/renderer/collection"
 require_relative "bsi/parser"
 require_relative "bsi/identifier"
 
@@ -44,7 +46,8 @@ config.types = [Pubid::Bsi::Identifier::BritishStandard,
                 Pubid::Bsi::Identifier::Amendment,
                 Pubid::Bsi::Identifier::Corrigendum,
                 Pubid::Bsi::Identifier::NationalAnnex,
-                Pubid::Bsi::Identifier::ExpertCommentary]
+                Pubid::Bsi::Identifier::ExpertCommentary,
+                Pubid::Bsi::Identifier::Collection]
 config.type_names = {
                       bs: {
                         long: "British Standard",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-bsi
 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-07 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,56 +58,56 @@ 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
 - !ruby/object:Gem::Dependency
   name: pubid-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: pubid-iec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: pubid-cen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
 description: Library to generate, parse and manipulate ISO PubID.
 email:
 - open.source@ribose.com
@@ -168,6 +126,7 @@ files:
 - lib/pubid/bsi/identifier/amendment.rb
 - lib/pubid/bsi/identifier/base.rb
 - lib/pubid/bsi/identifier/british_standard.rb
+- lib/pubid/bsi/identifier/collection.rb
 - lib/pubid/bsi/identifier/corrigendum.rb
 - lib/pubid/bsi/identifier/draft_document.rb
 - lib/pubid/bsi/identifier/expert_commentary.rb
@@ -178,6 +137,7 @@ files:
 - lib/pubid/bsi/parser.rb
 - lib/pubid/bsi/renderer/amendment.rb
 - lib/pubid/bsi/renderer/base.rb
+- lib/pubid/bsi/renderer/collection.rb
 - lib/pubid/bsi/renderer/corrigendum.rb
 - lib/pubid/bsi/renderer/draft_document.rb
 - lib/pubid/bsi/renderer/expert_commentary.rb
@@ -207,7 +167,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 ISO PubID.