nist-pubid 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0eda4fda43009a4ec9c9cdd35c0abcada305c5c9868d246b4df0c324f84ea326
-  data.tar.gz: 1392bed11a8b5d05126e6eb368fa650f013f4aac7a9c78d05f319b6e785bb42f
+  metadata.gz: 48d1d54a6499cb679c33cfa2a7cc2a682b6b41e9c66aab0c301375c5df28e3f3
+  data.tar.gz: 64fa186792b6564f8afc4f2388f4e2859b04dbcdca5f7cd00e40b192c7f9fc4a
 SHA512:
-  metadata.gz: 13a9854c8b67b0c7fc5202306501d8ec9d61ede0b73de2afbaefc8373fb7f798b7f7baa0caca9e6ab256bd6a929c55f09376ff2728465300d7d6098d929c2cad
-  data.tar.gz: d6e3685000eea4ccf494fc4b1ade59b5002a561bdc9597c9a11b7ae738d730461f3297b60b2f66a98b23ff4670c1c2cdc899562f409a6063e4c609096f73ea97
+  metadata.gz: 25197a16bbaa8b4799d0279cf19303de616da1e34452997df576be22cb459aa3b00f538af680d9fa37330d6c7358587d56173ab2bc10f57755774537185c205e
+  data.tar.gz: 3e6ae4db9939f1f415ae56ec5aba095a41706157143740a6412d78b560cf850854a779104b22edbc278234fc657ed3289aaf1ab832ef909d58b9d465ec86170b

data/.github/workflows/release.yml

@@ -0,0 +1,46 @@
+name: release
+
+on:
+  push:
+    tags:
+      - '*'
+  workflow_dispatch:
+    inputs:
+      next_version:
+        description: |
+          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+        required: true
+        default: 'skip'
+
+jobs:
+  release:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v1
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '2.6'
+          bundler-cache: true
+
+      - run: bundle exec rake
+
+      - run: gem install gem-release
+
+      - run: |
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+      - if: github.event_name == 'workflow_dispatch' && github.event.inputs.next_version != 'skip'
+        run: gem bump --version ${{ github.event.inputs.next_version }} --tag --push
+
+      - name: Publish to rubygems.org
+        env:
+          RUBYGEMS_API_KEY: ${{secrets.METANORMA_CI_RUBYGEMS_API_KEY}}
+        run: |
+          gem install gem-release
+          cat > ~/.gem/credentials << EOF
+          ---
+          :rubygems_api_key: ${RUBYGEMS_API_KEY}
+          EOF
+          chmod 0600 ~/.gem/credentials
+          gem release

data/lib/nist_pubid/document.rb

@@ -40,11 +40,10 @@ module NistPubid
     attr_accessor :serie, :code, :revision, :publisher, :version, :volume,
                   :part, :addendum, :stage, :translation, :update, :edition
 
-    def initialize(publisher:, serie:, docnumber:, stage: nil, **opts)
+    def initialize(publisher:, serie:, docnumber:, **opts)
       @publisher = Publisher.new(publisher: publisher)
       @serie = Serie.new(serie: serie)
       @code = docnumber
-      @stage = Stage.new(stage: stage)
       opts.each { |key, value| send("#{key}=", value) }
     end
 
@@ -52,7 +51,7 @@ module NistPubid
       matches = {
         publisher: match(Publisher.regexp, code) || "NIST",
         serie: match(Serie.regexp, code)&.gsub(/\./, " "),
-        stage: match(Stage.regexp, code),
+        stage: Stage.parse(code),
         docnumber: match(/(?<=\.|\s)[0-9-]{3,}[A-Z]?/, code),
         part: /(?<=(\.))?pt(?(1)-)([A-Z\d]+)/.match(code)&.[](2),
         volume: /(?<=(\.))?v(?(1)-)(\d+)/.match(code)&.[](2),
@@ -60,11 +59,13 @@ module NistPubid
         revision: /(?<=[^a-z])(?<=(\.))?(?:r(?(1)-)|Rev\.\s)(\d+)/
           .match(code)&.[](2),
         addendum: match(/(?<=(\.))?(add(?(1)-)\d+|Addendum)/, code),
-        translation: match(/(?<=\()\w{3}(?=\))/, code),
         update: match(/(?<=Upd\s)([\d:]+)/, code),
         edition: /(?<=[^a-z])(?<=(\.))?(?:e(?(1)-)|Ed\.\s)(\d+)/
           .match(code)&.[](2),
       }
+      code = code.gsub(matches[:stage].original_code, "") unless matches[:stage].nil?
+      matches[:translation] = match(/(?<=\()\w{3}(?=\))/, code)
+
       new(**matches)
     end
 
@@ -73,9 +74,11 @@ module NistPubid
     end
 
     def to_s(format)
-      result = "#{render_serie(format)}#{stage.to_s(format)}"\
-               "#{code}#{render_part(format)}#{render_edition(format)}"\
-               "#{render_update(format)}#{render_translation(format)}"
+      result = render_serie(format)
+      result += " " unless format == :short || stage.nil?
+      result += "#{stage&.to_s(format)}"\
+                " #{code}#{render_part(format)}#{render_edition(format)}"\
+                "#{render_update(format)}#{render_translation(format)}"
       result = render_addendum(result, format)
 
       return result.gsub(" ", ".") if format == :mr
@@ -84,9 +87,9 @@ module NistPubid
     end
 
     def render_serie(format)
-      return "#{serie.to_s(format)} " if %i[mr short].include?(format)
+      return serie.to_s(format) if %i[mr short].include?(format)
 
-      "#{publisher.to_s(format)} #{serie.to_s(format)} "
+      "#{publisher.to_s(format)} #{serie.to_s(format)}"
     end
 
     def render_part(format)

data/lib/nist_pubid/serie.rb

@@ -18,7 +18,7 @@ module NistPubid
     end
 
     def self.regexp
-      /(#{(SERIES["long"].keys + SERIES["mr"].values + ["NISTIR"]).join('|')})(?=\.|\s)/
+      /(#{(SERIES["long"].keys + SERIES["mr"].values + ["NISTIR"]).join('|')})(?=\.|\s|\()/
     end
   end
 end

data/lib/nist_pubid/stage.rb

@@ -2,21 +2,36 @@ STAGES = YAML.load_file(File.join(File.dirname(__FILE__), "../../stages.yaml"))
 
 module NistPubid
   class Stage
-    attr_accessor :stage
+    attr_accessor :stage, :original_code
 
-    def initialize(stage:)
-      @stage = stage
+    def initialize(original_code)
+      self.original_code = original_code
+      @stage = self.class.regexp.match(original_code)&.[](1)
     end
 
-    def to_s(format)
-      return "" if @stage.nil?
-      return "#{@stage} " if %i[short mr].include?(format)
+    def to_s(format = :short)
+      return "" if nil?
 
-      "#{STAGES[@stage]} "
+      case format
+      when :short
+        "(#{@stage})"
+      when :mr
+        @stage
+      else
+        STAGES[@stage]
+      end
+    end
+
+    def self.parse(code)
+      new(regexp.match(code)&.to_s)
     end
 
     def self.regexp
-      /(#{STAGES.keys.join('|')})(?=\.|\s)/
+      /\((#{STAGES.keys.join('|')})\)/
+    end
+
+    def nil?
+      @stage.nil?
     end
   end
 end

data/lib/nist_pubid/version.rb

@@ -1,3 +1,3 @@
 module NistPubid
-  VERSION = "0.1.2".freeze
+  VERSION = "0.1.3".freeze
 end

data/stages.yaml

@@ -2,4 +2,4 @@ IPD: Initial Public Draft
 2PD: Second Public Draft
 FPD: Final Public Draft
 WD: Work-in-Progress Draft
-PreD: Preliminary Draft
+PRD: Preliminary Draft

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nist-pubid
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2021-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -48,6 +48,7 @@ extra_rdoc_files:
 - LICENSE.txt
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".rspec"
 - ".rubocop.yml"
 - Gemfile