sequence_generator 2.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 537d34f1331da9357c2bc822c71e540fd345782c6ddfef6ec6e4270b5dcc827d
-  data.tar.gz: 4a2e76439bd0e7e64d79ff46e6c2bea5fa3829231c6906a2f36c5f6cdc0a0801
+  metadata.gz: 9743fdceddc13ecb151e9783053d56a3819dda07252182b7719ecfbd1a6dc6dd
+  data.tar.gz: b5eed6f0cea7c22c198cd0f5991065c3b5cbceebc3e4b6d1cc0ff802e84cbe9a
 SHA512:
-  metadata.gz: e51a00fd2c6b39460c613649e31bd5c0339ce23749c371194b0d01fa8ab4703d4caa5849c19794b93893d8732a5e2d1957bea7fce7fa975049748c639306abb2
-  data.tar.gz: 90df8fb107ed44660cfed091d01e57c72d20fb07c1e737006ac6afb113c35f705d14f479e01d302303057c30fece82d397426daef7ab9fcf868c65a95ff79b60
+  metadata.gz: 24d54dd928a069b547cb61a181adcb1de4af646f99bb533d91aa7fad7f31b377c8ebb517188ac40a71f748e3bb11106c0079a83bd541ec1e66e02da9210d2fcd
+  data.tar.gz: c9ee86bd2e5e49021a204ce09ffd6cd5992edb44e64c49a7386ed98e383a1bf64b7f0358ad1b937979914d547e512f45c40d4863f45543663f62aa120f883478

data/app/models/sequence_generator/sequence.rb

@@ -9,40 +9,62 @@ module SequenceGenerator
         date_to_consider = model.send(options[:date_column])
       end
 
-      prefix = name.gsub(/\([^()]*?\)/) do |x|
+      prefix = name.gsub(/[\(\{][^(){}]*?[\)\}]/) do |x|
+        fragment = x[1..-2] # strip () or {}
+        resolve_fragment(fragment, model, date_to_consider)
+      end
+
+      # Build sequence-driving prefix (only () fields)
+      sequence_prefix = name.gsub(/[\(\{][^(){}]*?[\)\}]/) do |x|
         fragment = x[1..-2]
-        case fragment
-        when "YYYY"
-          date_to_consider.strftime('%Y')
-        when "YY"
-          date_to_consider.strftime('%y')
-        when "IFYY"
-          financial_year_start_date = DateTime.new(date_to_consider.year, 4, 1, 0, 0, 0, Rational(5.5,24))
-          if date_to_consider > financial_year_start_date
-            "#{date_to_consider.strftime('%y')}-#{date_to_consider.next_year.strftime('%y')}"
-          else
-            "#{date_to_consider.prev_year.strftime('%y')}-#{date_to_consider.strftime('%y')}"
-          end
-        when "IFY"
-          financial_year_start_date = DateTime.new(date_to_consider.year, 4, 1, 0, 0, 0, Rational(5.5,24))
-          if date_to_consider > financial_year_start_date
-            "#{date_to_consider.strftime('%y')}#{date_to_consider.next_year.strftime('%y')}"
-          else
-            "#{date_to_consider.prev_year.strftime('%y')}#{date_to_consider.strftime('%y')}"
-          end
-        when "MM"
-          date_to_consider.strftime('%m')
+        if x.start_with?("(")
+          resolve_fragment(fragment, model, date_to_consider)
         else
-          model.send(fragment)
+          ""
         end
       end
 
-      prefix = prefix[/#*$/] == "" ? prefix + "#####" : prefix
-      digits = prefix[/#*$/].length
-      prefix_without_digits = prefix.split(/#*$/)[0]
-      next_number = CurrentSequence.get_next_number(prefix_without_digits, scope, purpose)
+
+      # Handle numeric padding
+      prefix = !prefix[/#+/] ? prefix + "#####" : prefix
+      digits = prefix[/#+/].length
+      prefix_without_digits, suffix = prefix.split(/#+/)
+      sequence_prefix_without_digits, sequence_suffix = sequence_prefix.split(/#+/)
+
+      # Use only sequence-driving prefix for lookup
+      next_number = CurrentSequence.get_next_number(sequence_prefix_without_digits, scope, purpose)
+
       sequence_number = "%0#{digits}d" % (next_number).to_s
-      prefix_without_digits + sequence_number
+      prefix_without_digits + sequence_number + (suffix || '')
+    end
+
+    def resolve_fragment(fragment, model, date_to_consider)
+      case fragment
+      when "YYYY"
+        date_to_consider.strftime('%Y')
+      when "YY"
+        date_to_consider.strftime('%y')
+      when "IFYY"
+        fy_start = DateTime.new(date_to_consider.year, 4, 1, 0, 0, 0, Rational(5.5,24))
+        if date_to_consider > fy_start
+          "#{date_to_consider.strftime('%y')}-#{date_to_consider.next_year.strftime('%y')}"
+        else
+          "#{date_to_consider.prev_year.strftime('%y')}-#{date_to_consider.strftime('%y')}"
+        end
+      when "IFY"
+        fy_start = DateTime.new(date_to_consider.year, 4, 1, 0, 0, 0, Rational(5.5,24))
+        if date_to_consider > fy_start
+          "#{date_to_consider.strftime('%y')}#{date_to_consider.next_year.strftime('%y')}"
+        else
+          "#{date_to_consider.prev_year.strftime('%y')}#{date_to_consider.strftime('%y')}"
+        end
+      when "MM"
+        date_to_consider.strftime('%m')
+      when "/"
+        "/"
+      else
+        model.send(fragment)
+      end
     end
   end
 end

data/lib/sequence_generator/version.rb

@@ -1,3 +1,3 @@
 module SequenceGenerator
-  VERSION = '2.0.1'
+  VERSION = '3.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequence_generator
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Prasann Shah
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-04 00:00:00.000000000 Z
+date: 2025-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Generate sequences formatted as a string for the users