sequenced 2.0.0 → 4.0.0

data/gemfiles/rails_7.gemfile.lock

@@ -0,0 +1,206 @@
+PATH
+  remote: ..
+  specs:
+    sequenced (4.0.0)
+      activerecord (>= 3.0)
+      activesupport (>= 3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activestorage (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      actionview (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.0)
+    actionpack (7.0.3.1)
+      actionview (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      rack (~> 2.0, >= 2.2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activestorage (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.0.3.1)
+      activesupport (= 7.0.3.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (7.0.3.1)
+      activesupport (= 7.0.3.1)
+      globalid (>= 0.3.6)
+    activemodel (7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activerecord (7.0.3.1)
+      activemodel (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activestorage (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.3.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.2)
+    builder (3.2.4)
+    concurrent-ruby (1.1.10)
+    crass (1.0.6)
+    digest (3.1.0)
+    erubi (1.11.0)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    json (2.6.2)
+    loofah (2.18.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (1.0.2)
+    method_source (1.0.0)
+    mini_mime (1.1.2)
+    minitest (5.16.2)
+    net-imap (0.2.3)
+      digest
+      net-protocol
+      strscan
+    net-pop (0.1.1)
+      digest
+      net-protocol
+      timeout
+    net-protocol (0.1.3)
+      timeout
+    net-smtp (0.3.1)
+      digest
+      net-protocol
+      timeout
+    nio4r (2.5.8)
+    nokogiri (1.13.8-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.13.8-x86_64-linux)
+      racc (~> 1.4)
+    parallel (1.22.1)
+    parser (3.1.2.1)
+      ast (~> 2.4.1)
+    pg (1.4.3)
+    racc (1.6.0)
+    rack (2.2.4)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails (7.0.3.1)
+      actioncable (= 7.0.3.1)
+      actionmailbox (= 7.0.3.1)
+      actionmailer (= 7.0.3.1)
+      actionpack (= 7.0.3.1)
+      actiontext (= 7.0.3.1)
+      actionview (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activemodel (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activestorage (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      bundler (>= 1.15.0)
+      railties (= 7.0.3.1)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.4.3)
+      loofah (~> 2.3)
+    railties (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      method_source
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.5.0)
+    rexml (3.2.5)
+    rubocop (1.35.0)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.1.2.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.14.3)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-progressbar (1.11.0)
+    sqlite3 (1.4.4)
+    standard (1.16.0)
+      rubocop (= 1.35.0)
+      rubocop-performance (= 1.14.3)
+    standardrb (1.0.1)
+      standard
+    strscan (3.0.4)
+    thor (1.2.1)
+    timeout (0.3.0)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.2.0)
+    websocket-driver (0.7.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.6.0)
+
+PLATFORMS
+  arm64-darwin-21
+  x86_64-linux
+
+DEPENDENCIES
+  appraisal
+  net-imap
+  net-pop
+  net-smtp
+  pg
+  rails (~> 7.0.0)
+  sequenced!
+  sqlite3 (~> 1.4.4)
+  standardrb
+
+BUNDLED WITH
+   2.3.16

data/gemfiles/rails_master.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "standardrb"
+gem "rails", github: "rails/rails", branch: "main"
+
+group :development, :test do
+  gem "sqlite3", "~> 1.4.4"
+  gem "pg"
+  gem "net-imap"
+  gem "net-pop"
+  gem "net-smtp"
+end
+
+gemspec path: "../"

data/gemfiles/rails_master.gemfile.lock

@@ -0,0 +1,215 @@
+GIT
+  remote: https://github.com/rails/rails.git
+  revision: cb5765a12751ca03866a89cf19fefcbc2d93a8ea
+  branch: main
+  specs:
+    actioncable (7.1.0.alpha)
+      actionpack (= 7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.1.0.alpha)
+      actionpack (= 7.1.0.alpha)
+      activejob (= 7.1.0.alpha)
+      activerecord (= 7.1.0.alpha)
+      activestorage (= 7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.1.0.alpha)
+      actionpack (= 7.1.0.alpha)
+      actionview (= 7.1.0.alpha)
+      activejob (= 7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.0)
+    actionpack (7.1.0.alpha)
+      actionview (= 7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+      rack (~> 2.0, >= 2.2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (7.1.0.alpha)
+      actionpack (= 7.1.0.alpha)
+      activerecord (= 7.1.0.alpha)
+      activestorage (= 7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+      globalid (>= 0.3.6)
+    activemodel (7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+    activerecord (7.1.0.alpha)
+      activemodel (= 7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+    activestorage (7.1.0.alpha)
+      actionpack (= 7.1.0.alpha)
+      activejob (= 7.1.0.alpha)
+      activerecord (= 7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (7.1.0.alpha)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    rails (7.1.0.alpha)
+      actioncable (= 7.1.0.alpha)
+      actionmailbox (= 7.1.0.alpha)
+      actionmailer (= 7.1.0.alpha)
+      actionpack (= 7.1.0.alpha)
+      actiontext (= 7.1.0.alpha)
+      actionview (= 7.1.0.alpha)
+      activejob (= 7.1.0.alpha)
+      activemodel (= 7.1.0.alpha)
+      activerecord (= 7.1.0.alpha)
+      activestorage (= 7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+      bundler (>= 1.15.0)
+      railties (= 7.1.0.alpha)
+    railties (7.1.0.alpha)
+      actionpack (= 7.1.0.alpha)
+      activesupport (= 7.1.0.alpha)
+      method_source
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.6)
+
+PATH
+  remote: ..
+  specs:
+    sequenced (4.0.0)
+      activerecord (>= 3.0)
+      activesupport (>= 3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.2)
+    builder (3.2.4)
+    concurrent-ruby (1.1.10)
+    connection_pool (2.2.5)
+    crass (1.0.6)
+    digest (3.1.0)
+    erubi (1.11.0)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    json (2.6.2)
+    loofah (2.18.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (1.0.2)
+    method_source (1.0.0)
+    mini_mime (1.1.2)
+    minitest (5.16.2)
+    net-imap (0.2.3)
+      digest
+      net-protocol
+      strscan
+    net-pop (0.1.1)
+      digest
+      net-protocol
+      timeout
+    net-protocol (0.1.3)
+      timeout
+    net-smtp (0.3.1)
+      digest
+      net-protocol
+      timeout
+    nio4r (2.5.8)
+    nokogiri (1.13.8-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.13.8-x86_64-linux)
+      racc (~> 1.4)
+    parallel (1.22.1)
+    parser (3.1.2.1)
+      ast (~> 2.4.1)
+    pg (1.4.3)
+    racc (1.6.0)
+    rack (2.2.4)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.4.3)
+      loofah (~> 2.3)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.5.0)
+    rexml (3.2.5)
+    rubocop (1.35.0)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.1.2.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.14.3)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-progressbar (1.11.0)
+    sqlite3 (1.4.4)
+    standard (1.16.0)
+      rubocop (= 1.35.0)
+      rubocop-performance (= 1.14.3)
+    standardrb (1.0.1)
+      standard
+    strscan (3.0.4)
+    thor (1.2.1)
+    timeout (0.3.0)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.2.0)
+    websocket-driver (0.7.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.6.0)
+
+PLATFORMS
+  arm64-darwin-21
+  x86_64-linux
+
+DEPENDENCIES
+  appraisal
+  net-imap
+  net-pop
+  net-smtp
+  pg
+  rails!
+  sequenced!
+  sqlite3 (~> 1.4.4)
+  standardrb
+
+BUNDLED WITH
+   2.3.16

data/lib/sequenced/acts_as_sequenced.rb

@@ -1,8 +1,14 @@
-require 'active_support/core_ext/hash/slice'
-require 'active_support/core_ext/class/attribute_accessors'
+require "active_support/core_ext/hash/slice"
+require "active_support/core_ext/class/attribute_accessors"
 
 module Sequenced
   module ActsAsSequenced
+    DEFAULT_OPTIONS = {
+      column: :sequential_id,
+      start_at: 1
+    }.freeze
+    SequencedColumnExists = Class.new(StandardError)
+
     def self.included(base)
       base.extend ClassMethods
     end
@@ -11,6 +17,8 @@ module Sequenced
       # Public: Defines ActiveRecord callbacks to set a sequential ID scoped
       # on a specific class.
       #
+      # Can be called multiple times to add hooks for different column names.
+      #
       # options - The Hash of options for configuration:
       #           :scope    - The Symbol representing the columm on which the
       #                       sequential ID should be scoped (default: nil)
@@ -31,17 +39,35 @@ module Sequenced
       #
       # Returns nothing.
       def acts_as_sequenced(options = {})
-        cattr_accessor :sequenced_options
-        self.sequenced_options = options
+        unless defined?(sequenced_options)
+          include Sequenced::ActsAsSequenced::InstanceMethods
+
+          mattr_accessor :sequenced_options, instance_accessor: false
+          self.sequenced_options = []
+
+          before_save :set_sequential_ids
+        end
+
+        options = DEFAULT_OPTIONS.merge(options)
+        column_name = options[:column]
 
-        before_save :set_sequential_id
-        include Sequenced::ActsAsSequenced::InstanceMethods
+        if sequenced_options.any? { |options| options[:column] == column_name }
+          raise(SequencedColumnExists, <<-MSG.squish)
+            Tried to set #{column_name} as sequenced but there was already a
+            definition here. Did you accidentally call acts_as_sequenced
+            multiple times on the same column?
+          MSG
+        else
+          sequenced_options << options
+        end
       end
     end
 
     module InstanceMethods
-      def set_sequential_id
-        Sequenced::Generator.new(self, self.class.base_class.sequenced_options).set
+      def set_sequential_ids
+        self.class.base_class.sequenced_options.each do |options|
+          Sequenced::Generator.new(self, options).set
+        end
       end
     end
   end

data/lib/sequenced/generator.rb

@@ -5,13 +5,15 @@ module Sequenced
     def initialize(record, options = {})
       @record = record
       @scope = options[:scope]
-      @column = (options[:column] || :sequential_id).to_sym
-      @start_at = options[:start_at] || 1
+      @column = options[:column].to_sym
+      @start_at = options[:start_at]
       @skip = options[:skip]
     end
 
     def set
-      record.send(:"#{column}=", next_id) unless id_set? || skip?
+      return if skip? || id_set?
+      lock_table
+      record.send(:"#{column}=", next_id)
     end
 
     def id_set?
@@ -19,7 +21,7 @@ module Sequenced
     end
 
     def skip?
-      skip && skip.call(record)
+      skip&.call(record)
     end
 
     def next_id
@@ -30,19 +32,33 @@ module Sequenced
 
     def next_id_in_sequence
       start_at = self.start_at.respond_to?(:call) ? self.start_at.call(record) : self.start_at
-      return start_at unless last_record = find_last_record
-      max(last_record.send(column) + 1, start_at)
+      if (last_record = find_last_record)
+        max(last_record.send(column) + 1, start_at)
+      else
+        start_at
+      end
     end
 
     def unique?(id)
       build_scope(*scope) do
         rel = base_relation
-        rel = rel.where("NOT id = ?", record.id) if record.persisted?
+        rel = rel.where.not(record.class.primary_key => record.id) if record.persisted?
         rel.where(column => id)
       end.count == 0
     end
 
-  private
+    private
+
+    def lock_table
+      if postgresql?
+        record.class.connection.execute("LOCK TABLE #{record.class.table_name} IN EXCLUSIVE MODE")
+      end
+    end
+
+    def postgresql?
+      defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) &&
+        record.class.connection.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+    end
 
     def base_relation
       record.class.base_class.unscoped
@@ -50,9 +66,9 @@ module Sequenced
 
     def find_last_record
       build_scope(*scope) do
-        base_relation.
-        where("#{column.to_s} IS NOT NULL").
-        order("#{column.to_s} DESC")
+        base_relation
+          .where("#{column} IS NOT NULL")
+          .order("#{column} DESC")
       end.first
     end
 
@@ -65,6 +81,5 @@ module Sequenced
     def max(*values)
       values.to_a.max
     end
-
   end
-end
+end

data/lib/sequenced/version.rb

@@ -1,3 +1,3 @@
 module Sequenced
-  VERSION = "2.0.0"
+  VERSION = "4.0.0"
 end

data/lib/sequenced.rb

@@ -1,4 +1,6 @@
-require 'sequenced/generator'
-require 'sequenced/acts_as_sequenced'
+require "sequenced/generator"
+require "sequenced/acts_as_sequenced"
 
-ActiveRecord::Base.send(:include, Sequenced::ActsAsSequenced)
+ActiveSupport.on_load(:active_record) do
+  include Sequenced::ActsAsSequenced
+end

data/sequenced.gemspec

@@ -2,20 +2,18 @@ $:.push File.expand_path("../lib", __FILE__)
 require "sequenced/version"
 
 Gem::Specification.new do |s|
-  s.name        = "sequenced"
-  s.version     = Sequenced::VERSION
-  s.authors     = ["Derrick Reimer"]
-  s.licenses    = ['MIT']
-  s.email       = ["derrickreimer@gmail.com"]
-  s.homepage    = "https://github.com/djreimer/sequenced"
-  s.summary     = "Generate scoped sequential IDs for ActiveRecord models"
+  s.name = "sequenced"
+  s.version = Sequenced::VERSION
+  s.authors = ["Derrick Reimer"]
+  s.licenses = ["MIT"]
+  s.email = ["derrickreimer@gmail.com"]
+  s.homepage = "https://github.com/derrickreimer/sequenced"
+  s.summary = "Generate scoped sequential IDs for ActiveRecord models"
   s.description = "Sequenced is a gem that generates scoped sequential IDs for ActiveRecord models."
 
-  s.files = `git ls-files`.split("\n")
-  s.test_files = Dir["test/**/*"]
+  s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
 
   s.add_dependency "activesupport", ">= 3.0"
   s.add_dependency "activerecord", ">= 3.0"
   s.add_development_dependency "rails", ">= 3.1"
-  s.add_development_dependency "sqlite3"
 end