sequenced 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d72c557b133b01ba1b82aaee020a2e798f6744b5
-  data.tar.gz: 4799ecc4ec9e791a1e0febc66acf58ab137ee361
+SHA256:
+  metadata.gz: a27946de6bd01c2c4c7d97d929df68f4fa01a34c23f721473eb0b7f2e2c22c5e
+  data.tar.gz: be78bda96414d8bfdc2b45162294263f665c02f43b5135e8ed23f79fa6011b07
 SHA512:
-  metadata.gz: 241378e6cefa16d9267b5d5ea1c7c3ccd16e9b12ff427065af94068b285af9810da608fdce7770c39534cbf06aa7edcddd29500a673c216782752c8ba06892d9
-  data.tar.gz: 08a6e2197428200a2c6105f5d5d37a0f3b3e867531dcb0ada80666612920d27935cbad6f6ade7cf37bb7b664d20be1331bd55ace24d9dfae32fd4f1eadbd1612
+  metadata.gz: d7c24c3b5c4f4dcc77ea64043dc6afff72a1f2fa38642e9129c5f41f7dfccbbbf06c4438de790fdb6cfcd8695c8abcf923df67cb706f141d36815f81ca622209
+  data.tar.gz: d11ef41c80d7e26c696ee96553ab2b3a0cd272cb24c63880beb4b3fc5d3a4e74e6733e4e58dfbac172947971e4019f6467d811718e5d078164c08e49adb38d10

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.2.3
+  - 2.4.1
 
 env:
   - DB=sqlite
@@ -10,4 +9,5 @@ env:
 before_script:
   - rake db:create
 
-sudo: false
+services:
+  - postgresql

data/CHANGELOG.md

@@ -1,14 +1,26 @@
+3.2.0 (January 29, 2020)
+------------------------
+
+* Support non-default primary key columns (set via `primary_key=`) (#41)
+* Fix issue with Postgres adapter check when using a subclassed adapter (#42)
+
+3.1.1 (January 30, 2016)
+-------------------------
+
+* Rails 3 compatibility
+  (samphilipd, [#22](https://github.com/derrickreimer/sequenced/pull/22))
+
 3.1.0 (January 23, 2016)
 -------------------------
 
 * Allow multiple sequences on one record
-  (samphilipd, [#19](https://github.com/djreimer/sequenced/pull/19))
+  (samphilipd, [#19](https://github.com/derrickreimer/sequenced/pull/19))
 
 3.0.0 (November 28, 2015)
 -------------------------
 
 * Make this gem thread-safe for PostgreSQL
-  (samphilipd, [#16](https://github.com/djreimer/sequenced/pull/16))
+  (samphilipd, [#16](https://github.com/derrickreimer/sequenced/pull/16))
 
 2.0.0 (October 24, 2014)
 ------------------------

data/Gemfile

@@ -9,7 +9,7 @@ gemspec
 gem "jquery-rails"
 
 group :development, :test do
-  gem 'sqlite3'
+  gem 'sqlite3', '~> 1.3.6'
   # gem 'mysql2'
   gem 'pg'
 end

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2016 Derrick Reimer
+Copyright 2012-2020 Derrick Reimer
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,8 +1,8 @@
 # Sequenced
 
-[![Build Status](https://travis-ci.org/djreimer/sequenced.png)](https://travis-ci.org/djreimer/sequenced)
-[![Code Climate](https://codeclimate.com/github/djreimer/sequenced.png)](https://codeclimate.com/github/djreimer/sequenced)
-[![Gem Version](https://badge.fury.io/rb/sequenced.png)](http://badge.fury.io/rb/sequenced)
+[![Build Status](https://travis-ci.org/derrickreimer/sequenced.svg)](https://travis-ci.org/derrickreimer/sequenced)
+[![Code Climate](https://codeclimate.com/github/djreimer/sequenced.svg)](https://codeclimate.com/github/djreimer/sequenced)
+[![Gem Version](https://badge.fury.io/rb/sequenced.svg)](http://badge.fury.io/rb/sequenced)
 
 Sequenced is a simple gem that generates scoped sequential IDs for
 ActiveRecord models. This gem provides an `acts_as_sequenced` macro that
@@ -106,6 +106,33 @@ class CreateBadgers < ActiveRecord::Migration
 end
 ```
 
+If you are adding a sequenced column to an existing table, you need to account for that in your migration.
+
+Here is an example migration that adds and sets the `sequential_id` column based on the current database records:
+```ruby
+# app/db/migrations/20151120190645_add_sequental_id_to_badgers.rb
+class AddSequentalIdToBadgers < ActiveRecord::Migration
+  add_column :badgers, :sequential_id, :integer
+
+  execute <<~SQL
+    UPDATE badgers
+    SET sequential_id = old_badgers.next_sequential_id
+    FROM (
+      SELECT id, ROW_NUMBER()
+      OVER(
+        PARTITION BY burrow_id
+        ORDER BY id
+      ) AS next_sequential_id
+      FROM badgers
+    ) old_badgers
+    WHERE badgers.id = old_badgers.id
+  SQL
+
+  change_column :badgers, :sequential_id, :integer, null: false
+  add_index :badgers, [:sequential_id, :burrow_id], unique: true
+end
+```
+
 ## Configuration
 
 ### Overriding the default sequential ID column
@@ -166,7 +193,7 @@ class Answer < ActiveRecord::Base
 
   # Automatically use the sequential ID in URLs
   def to_param
-    self.sequential_id
+    self.sequential_id.to_s
   end
 end
 

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
@@ -39,7 +39,7 @@ module Sequenced
     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
@@ -54,7 +54,7 @@ module Sequenced
 
     def postgresql?
       defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) &&
-        record.class.connection.instance_of?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+        record.class.connection.kind_of?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
     end
 
     def base_relation

data/lib/sequenced/version.rb

@@ -1,3 +1,3 @@
 module Sequenced
-  VERSION = "3.1.1"
+  VERSION = "3.2.0"
 end

data/sequenced.gemspec

@@ -7,12 +7,11 @@ Gem::Specification.new do |s|
   s.authors     = ["Derrick Reimer"]
   s.licenses    = ['MIT']
   s.email       = ["derrickreimer@gmail.com"]
-  s.homepage    = "https://github.com/djreimer/sequenced"
+  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.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Derrick Reimer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-30 00:00:00.000000000 Z
+date: 2020-01-29 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,8 +60,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
@@ -72,82 +72,7 @@ files:
 - 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: {}
@@ -157,89 +82,18 @@ 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
+rubygems_version: 2.7.3
 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/test/acts_as_sequenced_test.rb

@@ -1,132 +0,0 @@
-require 'test_helper'
-
-# Test Models:
-#
-#   Answer       - :scope => :question_id
-#   Comment      - :scope => :question_id (with an AR default scope)
-#   Invoice      - :scope => :account_id, :start_at => 1000
-#   Product      - :scope => :account_id, :start_at => lambda { |r| r.computed_start_value }
-#   Order        - :scope => :non_existent_column
-#   User         - :scope => :account_id, :column => :custom_sequential_id
-#   Address      - :scope => :account_id ('sequential_id' does not exist)
-#   Email        - :scope => [:emailable_id, :emailable_type]
-#   Subscription - no options
-#   Rating       - :scope => :comment_id, skip: { |r| r.score == 0 }
-#   Monster      - no options
-#   Zombie       - STI, inherits from Monster
-#   Werewolf     - STI, inherits from Monster
-
-class ActsAsSequencedTest < ActiveSupport::TestCase
-  test "default start_at" do
-    question = Question.create
-    answer = question.answers.create
-    assert_equal 1, answer.sequential_id
-  end
-
-  test "custom start_at" do
-    account = Account.create
-    invoice = account.invoices.create
-    assert_equal 1000, invoice.sequential_id
-
-    another_invoice = account.invoices.create
-    assert_equal 1001, another_invoice.sequential_id
-  end
-
-  test "lambda start_at" do
-    account = Account.create
-    product = Product.create(:account_id => account.id)
-    assert_equal 3, product.sequential_id
-
-    another_product = Product.create(:account_id => account.id)
-    assert_equal 4, another_product.sequential_id
-  end
-
-  test "custom start_at with populated table" do
-    account = Account.create
-    account.invoices.create(:sequential_id => 1)
-    invoice = account.invoices.create
-    assert_equal 1000, invoice.sequential_id
-  end
-
-  test "sequential id increment" do
-    question = Question.create
-    question.answers.create(:sequential_id => 10)
-    another_answer = question.answers.create
-    assert_equal 11, another_answer.sequential_id
-  end
-
-  test "default scope" do
-    Subscription.create(:sequential_id => 1)
-    subscription = Subscription.create
-    assert_equal 2, subscription.sequential_id
-  end
-
-  test "undefined scope method" do
-    account = Account.create
-    order = account.orders.build
-    assert_raises(NoMethodError) { order.save }
-  end
-
-  test "custom sequential id column" do
-    account = Account.create
-    user = account.users.create
-    assert_equal 1, user.custom_sequential_id
-  end
-
-  test "sequential id remains on save" do
-    question = Question.create
-    answer = question.answers.create
-    assert_equal 1, answer.sequential_id
-
-    answer.reload
-    answer.body = "Updated body"
-    answer.save
-    assert_equal 1, answer.sequential_id
-  end
-
-  test "undefined sequential id column" do
-    account = Account.create
-    address = account.addresses.build
-    assert_raises(NoMethodError) { address.save }
-  end
-
-  test "manually setting sequential id" do
-    question = Question.create
-    answer = question.answers.build(:sequential_id => 10)
-    another_answer = question.answers.build(:sequential_id => 10)
-    answer.save
-    another_answer.save
-
-    assert_equal 10, answer.sequential_id
-    assert_equal 10, another_answer.sequential_id
-  end
-
-  test "model with a default scope for sorting" do
-    question = Question.create
-    (1..3).each { |id| question.comments.create(:sequential_id => id) }
-    comment = question.comments.create
-    assert_equal 4, comment.sequential_id
-  end
-
-  test "multi-column scopes" do
-    Email.create(:emailable_id => 1, :emailable_type => "User", :sequential_id => 2)
-    Email.create(:emailable_id => 1, :emailable_type => "Question", :sequential_id => 3)
-    email = Email.create(:emailable_id => 1, :emailable_type => "User")
-    assert_equal 3, email.sequential_id
-  end
-
-  test "skip option" do
-    rating = Rating.create(:comment_id => 1, :score => 1)
-    assert_equal 1, rating.sequential_id
-
-    rating = Rating.create(:comment_id => 1, :score => 0)
-    assert_equal nil, rating.sequential_id
-  end
-
-  test "STI" do
-    zombie = Zombie.create
-    werewolf = Werewolf.create
-    assert_equal 1, zombie.sequential_id
-    assert_equal 2, werewolf.sequential_id
-  end
-end