sequence_generator 3.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f764d717bded95d9299728b1aa65a3bccf54b040c4c452e9b50598984d7e5e7
-  data.tar.gz: f2d455a5c69e884424b21266e4d51ad54383f5c8fdf65092568826aa8bc47371
+  metadata.gz: 9743fdceddc13ecb151e9783053d56a3819dda07252182b7719ecfbd1a6dc6dd
+  data.tar.gz: b5eed6f0cea7c22c198cd0f5991065c3b5cbceebc3e4b6d1cc0ff802e84cbe9a
 SHA512:
-  metadata.gz: 30d665ca0358b8f678974e6cd1ea7fae06582ef575c0d99ff47adad6b6ce4da51d8aea0ffd363382544b947c58b4be96b4dcb4f4950bd49fe898e025beb17133
-  data.tar.gz: b4d4f71ca6a12305f5f50b7991385dd95116e1af5d9a09fb37a2c9ff803ce0b0f9a501a5568331ab14734ba9b31f8fd1fd7f99a7eb955cc7bba06b0313a7970c
+  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
 
+
+      # Handle numeric padding
       prefix = !prefix[/#+/] ? prefix + "#####" : prefix
       digits = prefix[/#+/].length
       prefix_without_digits, suffix = prefix.split(/#+/)
-      next_number = CurrentSequence.get_next_number(prefix_without_digits || '', scope, purpose)
+      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 + (suffix || '')
+      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 = '3.0.0'
+  VERSION = '3.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequence_generator
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Prasann Shah
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-23 00:00:00.000000000 Z
+date: 2025-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails