sequenced 3.1.0 → 4.0.0

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,5 +1,5 @@
-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
@@ -42,9 +42,8 @@ module Sequenced
         unless defined?(sequenced_options)
           include Sequenced::ActsAsSequenced::InstanceMethods
 
-          mattr_accessor :sequenced_options, instance_accessor: false do
-            []
-          end
+          mattr_accessor :sequenced_options, instance_accessor: false
+          self.sequenced_options = []
 
           before_save :set_sequential_ids
         end
@@ -52,7 +51,7 @@ module Sequenced
         options = DEFAULT_OPTIONS.merge(options)
         column_name = options[:column]
 
-        if sequenced_options.any? {|options| options[:column] == column_name}
+        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

data/lib/sequenced/generator.rb

@@ -11,7 +11,7 @@ module Sequenced
     end
 
     def set
-      return if id_set? || skip?
+      return if skip? || id_set?
       lock_table
       record.send(:"#{column}=", next_id)
     end
@@ -21,7 +21,7 @@ module Sequenced
     end
 
     def skip?
-      skip && skip.call(record)
+      skip&.call(record)
     end
 
     def next_id
@@ -32,19 +32,22 @@ 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?
@@ -54,7 +57,7 @@ module Sequenced
 
     def postgresql?
       defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) &&
-        record.class.connection.instance_of?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+        record.class.connection.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
     end
 
     def base_relation
@@ -63,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
 
@@ -78,6 +81,5 @@ module Sequenced
     def max(*values)
       values.to_a.max
     end
-
   end
 end

data/lib/sequenced/version.rb

@@ -1,3 +1,3 @@
 module Sequenced
-  VERSION = "3.1.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,17 +2,16 @@ $:.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"

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: sequenced
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Derrick Reimer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-23 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 description: Sequenced is a gem that generates scoped sequential IDs for ActiveRecord
@@ -60,186 +60,50 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".github/workflows/ci.yml"
+- ".gitignore"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
+- gemfiles/rails_5_2.gemfile
+- gemfiles/rails_5_2.gemfile.lock
+- gemfiles/rails_6.gemfile
+- gemfiles/rails_6.gemfile.lock
+- gemfiles/rails_6_1.gemfile
+- gemfiles/rails_6_1.gemfile.lock
+- gemfiles/rails_7.gemfile
+- gemfiles/rails_7.gemfile.lock
+- gemfiles/rails_master.gemfile
+- gemfiles/rails_master.gemfile.lock
 - lib/sequenced.rb
 - lib/sequenced/acts_as_sequenced.rb
 - lib/sequenced/generator.rb
 - lib/sequenced/version.rb
 - sequenced.gemspec
-- test/acts_as_sequenced_test.rb
-- test/concurrency_test.rb
-- test/dummy/README.rdoc
-- test/dummy/Rakefile
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/mailers/.gitkeep
-- test/dummy/app/models/.gitkeep
-- test/dummy/app/models/account.rb
-- test/dummy/app/models/address.rb
-- test/dummy/app/models/answer.rb
-- test/dummy/app/models/comment.rb
-- test/dummy/app/models/concurrent_badger.rb
-- test/dummy/app/models/doppelganger.rb
-- test/dummy/app/models/email.rb
-- test/dummy/app/models/invoice.rb
-- test/dummy/app/models/monster.rb
-- test/dummy/app/models/order.rb
-- test/dummy/app/models/policeman.rb
-- test/dummy/app/models/product.rb
-- test/dummy/app/models/question.rb
-- test/dummy/app/models/rating.rb
-- test/dummy/app/models/subscription.rb
-- test/dummy/app/models/user.rb
-- test/dummy/app/models/werewolf.rb
-- test/dummy/app/models/zombie.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/config.ru
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/db/development.sqlite3
-- test/dummy/db/migrate/20120219165346_create_questions.rb
-- test/dummy/db/migrate/20120219165548_create_answers.rb
-- test/dummy/db/migrate/20120219171957_create_accounts.rb
-- test/dummy/db/migrate/20120219172039_create_invoices.rb
-- test/dummy/db/migrate/20120219172922_create_orders.rb
-- test/dummy/db/migrate/20120219174931_create_subscriptions.rb
-- test/dummy/db/migrate/20120219175744_create_users.rb
-- test/dummy/db/migrate/20120219232323_create_addresses.rb
-- test/dummy/db/migrate/20120220000804_create_comments.rb
-- test/dummy/db/migrate/20130411225444_create_emails.rb
-- test/dummy/db/migrate/20130715002029_create_ratings.rb
-- test/dummy/db/migrate/20130730004055_create_products.rb
-- test/dummy/db/migrate/20131226000000_create_monsters.rb
-- test/dummy/db/migrate/20140404195334_create_policemen.rb
-- test/dummy/db/migrate/20151120190645_create_concurrent_badgers.rb
-- test/dummy/db/migrate/20160118182655_create_doppelgangers.rb
-- test/dummy/db/schema.rb
-- test/dummy/db/test.sqlite3
-- test/dummy/lib/assets/.gitkeep
-- test/dummy/log/.gitkeep
-- test/dummy/log/development.log
-- test/dummy/log/test.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/script/rails
-- test/multiple_sequences_test.rb
-- test/test_helper.rb
-homepage: https://github.com/djreimer/sequenced
+homepage: https://github.com/derrickreimer/sequenced
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.3.0
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Generate scoped sequential IDs for ActiveRecord models
-test_files:
-- test/acts_as_sequenced_test.rb
-- test/concurrency_test.rb
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/models/account.rb
-- test/dummy/app/models/address.rb
-- test/dummy/app/models/answer.rb
-- test/dummy/app/models/comment.rb
-- test/dummy/app/models/concurrent_badger.rb
-- test/dummy/app/models/doppelganger.rb
-- test/dummy/app/models/email.rb
-- test/dummy/app/models/invoice.rb
-- test/dummy/app/models/monster.rb
-- test/dummy/app/models/order.rb
-- test/dummy/app/models/policeman.rb
-- test/dummy/app/models/product.rb
-- test/dummy/app/models/question.rb
-- test/dummy/app/models/rating.rb
-- test/dummy/app/models/subscription.rb
-- test/dummy/app/models/user.rb
-- test/dummy/app/models/werewolf.rb
-- test/dummy/app/models/zombie.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config.ru
-- test/dummy/db/development.sqlite3
-- test/dummy/db/migrate/20120219165346_create_questions.rb
-- test/dummy/db/migrate/20120219165548_create_answers.rb
-- test/dummy/db/migrate/20120219171957_create_accounts.rb
-- test/dummy/db/migrate/20120219172039_create_invoices.rb
-- test/dummy/db/migrate/20120219172922_create_orders.rb
-- test/dummy/db/migrate/20120219174931_create_subscriptions.rb
-- test/dummy/db/migrate/20120219175744_create_users.rb
-- test/dummy/db/migrate/20120219232323_create_addresses.rb
-- test/dummy/db/migrate/20120220000804_create_comments.rb
-- test/dummy/db/migrate/20130411225444_create_emails.rb
-- test/dummy/db/migrate/20130715002029_create_ratings.rb
-- test/dummy/db/migrate/20130730004055_create_products.rb
-- test/dummy/db/migrate/20131226000000_create_monsters.rb
-- test/dummy/db/migrate/20140404195334_create_policemen.rb
-- test/dummy/db/migrate/20151120190645_create_concurrent_badgers.rb
-- test/dummy/db/migrate/20160118182655_create_doppelgangers.rb
-- test/dummy/db/schema.rb
-- test/dummy/db/test.sqlite3
-- test/dummy/log/development.log
-- test/dummy/log/test.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
-- test/dummy/script/rails
-- test/multiple_sequences_test.rb
-- test/test_helper.rb
+test_files: []

data/.travis.yml

@@ -1,13 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3
-  - 2.2.3
-
-env:
-  - DB=sqlite
-  - DB=postgresql
-
-before_script:
-  - rake db:create
-
-sudo: false