sequence_generator 3.0.0 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f764d717bded95d9299728b1aa65a3bccf54b040c4c452e9b50598984d7e5e7
-  data.tar.gz: f2d455a5c69e884424b21266e4d51ad54383f5c8fdf65092568826aa8bc47371
+  metadata.gz: e3b83a07aecf2f5425decdf139aef010df6980ba61a647522d7ab0b64fc34d42
+  data.tar.gz: 548b24e390035b36d38319ca924628540e050864fcfbc247af6df9c34e1ad7b5
 SHA512:
-  metadata.gz: 30d665ca0358b8f678974e6cd1ea7fae06582ef575c0d99ff47adad6b6ce4da51d8aea0ffd363382544b947c58b4be96b4dcb4f4950bd49fe898e025beb17133
-  data.tar.gz: b4d4f71ca6a12305f5f50b7991385dd95116e1af5d9a09fb37a2c9ff803ce0b0f9a501a5568331ab14734ba9b31f8fd1fd7f99a7eb955cc7bba06b0313a7970c
+  metadata.gz: 1cfce30a311a3572fc11c0100acee66fa67a5c7bd0631f72fd3923411508d8f9c38caed5ffc33f8c5d23ae96c6a6fb1db738db3e4903c0c42bd5e1d3cd24452d
+  data.tar.gz: 418f7664daad1f9cdc50e8328725e6843bd46455322b3e86c26c7971b8682ec5de63a6ad616a2eca3fe1b29c162d70aa2f8271467f253aeb1c1959012afffe57

data/Rakefile

@@ -23,6 +23,10 @@ require 'bundler/gem_tasks'
 
 require 'rake/testtask'
 
+task :prepare do
+  sh "cd test/dummy && RAILS_ENV=test bin/rails db:prepare"
+end
+
 Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'

data/app/models/sequence_generator/sequence.rb

@@ -9,40 +9,61 @@ 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 = options[: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.4'
 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.4
 platform: ruby
 authors:
 - Prasann Shah
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-23 00:00:00.000000000 Z
+date: 2026-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Generate sequences formatted as a string for the users