sequenced 1.2.0 → 1.3.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+1.3.0 (April 11, 2013)
+----------------------
+
+* Fix a potential bug that could overwrite previously set sequential IDs if
+  they are later found to be non-unique.
+
 1.2.0 (April 11, 2013)
 ----------------------
 

data/lib/sequenced/acts_as_sequenced.rb

@@ -59,6 +59,13 @@ module Sequenced
         scope  = self.class.sequenced_options[:scope]
         column = self.class.sequenced_options[:column]
         
+        unless self.respond_to?(column)
+          raise ArgumentError, "Column method ##{column.to_s} is undefined"
+        end
+        
+        # Short-circuit here if the ID is already set
+        return unless self.send(column).nil?
+        
         if scope.present?
           if scope.is_a?(Array)
             scope.each { |s| verify_scope_method(s) }
@@ -67,10 +74,6 @@ module Sequenced
           end
         end
         
-        unless self.respond_to?(column)
-          raise ArgumentError, "Column method ##{column.to_s} is undefined"
-        end
-        
         # Fetch the next ID unless it is already defined
         self.send(:"#{column}=", next_sequential_id) until sequential_id_is_unique?
       end

data/lib/sequenced/version.rb

@@ -1,3 +1,3 @@
 module Sequenced
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/test/dummy/log/test.log

@@ -11871,3 +11871,161 @@ Migrating to CreateEmails (20130411225444)
    (0.0ms)  SAVEPOINT active_record_1
    (0.0ms)  ROLLBACK TO SAVEPOINT active_record_1
    (5.8ms)  rollback transaction
+Connecting to database specified by database.yml
+   (1.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreateQuestions (20120219165346)
+Migrating to CreateAnswers (20120219165548)
+Migrating to CreateAccounts (20120219171957)
+Migrating to CreateInvoices (20120219172039)
+Migrating to CreateOrders (20120219172922)
+Migrating to CreateSubscriptions (20120219174931)
+Migrating to CreateUsers (20120219175744)
+Migrating to CreateAddresses (20120219232323)
+Migrating to CreateComments (20120220000804)
+Migrating to CreateEmails (20130411225444)
+   (0.0ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (3.8ms)  INSERT INTO "accounts" ("created_at", "name", "updated_at") VALUES (?, ?, ?)  [["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["name", nil], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."account_id" = 1 AND (custom_sequential_id IS NOT NULL) ORDER BY custom_sequential_id DESC LIMIT 1
+   (0.1ms)  SELECT COUNT(*) FROM "users" WHERE "users"."custom_sequential_id" = 1 AND "users"."account_id" = 1
+  SQL (0.5ms)  INSERT INTO "users" ("account_id", "created_at", "custom_sequential_id", "name", "updated_at") VALUES (?, ?, ?, ?, ?)  [["account_id", 1], ["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["custom_sequential_id", 1], ["name", nil], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (55.9ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.4ms)  INSERT INTO "accounts" ("created_at", "name", "updated_at") VALUES (?, ?, ?)  [["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["name", nil], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  Invoice Load (0.1ms)  SELECT "invoices".* FROM "invoices" WHERE "invoices"."account_id" = 1 AND (sequential_id IS NOT NULL) ORDER BY sequential_id DESC LIMIT 1
+   (0.1ms)  SELECT COUNT(*) FROM "invoices" WHERE "invoices"."sequential_id" = 1000 AND "invoices"."account_id" = 1
+  SQL (0.4ms)  INSERT INTO "invoices" ("account_id", "amount", "created_at", "sequential_id", "updated_at") VALUES (?, ?, ?, ?, ?)  [["account_id", 1], ["amount", nil], ["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["sequential_id", 1000], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  Invoice Load (0.2ms)  SELECT "invoices".* FROM "invoices" WHERE "invoices"."account_id" = 1 AND (sequential_id IS NOT NULL) ORDER BY sequential_id DESC LIMIT 1
+   (0.1ms)  SELECT COUNT(*) FROM "invoices" WHERE "invoices"."sequential_id" = 1001 AND "invoices"."account_id" = 1
+  SQL (0.2ms)  INSERT INTO "invoices" ("account_id", "amount", "created_at", "sequential_id", "updated_at") VALUES (?, ?, ?, ?, ?)  [["account_id", 1], ["amount", nil], ["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["sequential_id", 1001], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.6ms)  rollback transaction
+   (0.4ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "accounts" ("created_at", "name", "updated_at") VALUES (?, ?, ?)  [["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["name", nil], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "invoices" ("account_id", "amount", "created_at", "sequential_id", "updated_at") VALUES (?, ?, ?, ?, ?)  [["account_id", 1], ["amount", nil], ["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["sequential_id", 1], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  Invoice Load (0.1ms)  SELECT "invoices".* FROM "invoices" WHERE "invoices"."account_id" = 1 AND (sequential_id IS NOT NULL) ORDER BY sequential_id DESC LIMIT 1
+   (0.1ms)  SELECT COUNT(*) FROM "invoices" WHERE "invoices"."sequential_id" = 1000 AND "invoices"."account_id" = 1
+  SQL (0.2ms)  INSERT INTO "invoices" ("account_id", "amount", "created_at", "sequential_id", "updated_at") VALUES (?, ?, ?, ?, ?)  [["account_id", 1], ["amount", nil], ["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["sequential_id", 1000], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.5ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "subscriptions" ("created_at", "plan", "sequential_id", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["plan", nil], ["sequential_id", 1], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  Subscription Load (0.1ms)  SELECT "subscriptions".* FROM "subscriptions" WHERE (sequential_id IS NOT NULL) ORDER BY sequential_id DESC LIMIT 1
+   (0.1ms)  SELECT COUNT(*) FROM "subscriptions" WHERE "subscriptions"."sequential_id" = 2
+  SQL (0.3ms)  INSERT INTO "subscriptions" ("created_at", "plan", "sequential_id", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["plan", nil], ["sequential_id", 2], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (1.3ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "questions" ("body", "created_at", "summary", "updated_at") VALUES (?, ?, ?, ?)  [["body", nil], ["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["summary", nil], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  Answer Load (0.2ms)  SELECT "answers".* FROM "answers" WHERE "answers"."question_id" = 1 AND (sequential_id IS NOT NULL) ORDER BY sequential_id DESC LIMIT 1
+   (0.1ms)  SELECT COUNT(*) FROM "answers" WHERE "answers"."sequential_id" = 1 AND "answers"."question_id" = 1
+  SQL (0.5ms)  INSERT INTO "answers" ("body", "created_at", "question_id", "sequential_id", "updated_at") VALUES (?, ?, ?, ?, ?)  [["body", nil], ["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["question_id", 1], ["sequential_id", 1], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.7ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "questions" ("body", "created_at", "summary", "updated_at") VALUES (?, ?, ?, ?)  [["body", nil], ["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["summary", nil], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "answers" ("body", "created_at", "question_id", "sequential_id", "updated_at") VALUES (?, ?, ?, ?, ?)  [["body", nil], ["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["question_id", 1], ["sequential_id", 10], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  INSERT INTO "answers" ("body", "created_at", "question_id", "sequential_id", "updated_at") VALUES (?, ?, ?, ?, ?)  [["body", nil], ["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["question_id", 1], ["sequential_id", 10], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.6ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "questions" ("body", "created_at", "summary", "updated_at") VALUES (?, ?, ?, ?)  [["body", nil], ["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["summary", nil], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.4ms)  INSERT INTO "comments" ("body", "created_at", "question_id", "sequential_id", "updated_at") VALUES (?, ?, ?, ?, ?)  [["body", nil], ["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["question_id", 1], ["sequential_id", 1], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  INSERT INTO "comments" ("body", "created_at", "question_id", "sequential_id", "updated_at") VALUES (?, ?, ?, ?, ?)  [["body", nil], ["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["question_id", 1], ["sequential_id", 2], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  INSERT INTO "comments" ("body", "created_at", "question_id", "sequential_id", "updated_at") VALUES (?, ?, ?, ?, ?)  [["body", nil], ["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["question_id", 1], ["sequential_id", 3], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  Comment Load (0.1ms)  SELECT "comments".* FROM "comments" WHERE "comments"."question_id" = 1 AND (sequential_id IS NOT NULL) ORDER BY sequential_id DESC LIMIT 1
+   (0.1ms)  SELECT COUNT(*) FROM "comments" WHERE "comments"."sequential_id" = 4 AND "comments"."question_id" = 1
+  SQL (0.1ms)  INSERT INTO "comments" ("body", "created_at", "question_id", "sequential_id", "updated_at") VALUES (?, ?, ?, ?, ?)  [["body", nil], ["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["question_id", 1], ["sequential_id", 4], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.7ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.4ms)  INSERT INTO "emails" ("address", "created_at", "emailable_id", "emailable_type", "sequential_id", "updated_at") VALUES (?, ?, ?, ?, ?, ?)  [["address", nil], ["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["emailable_id", 1], ["emailable_type", "User"], ["sequential_id", 2], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "emails" ("address", "created_at", "emailable_id", "emailable_type", "sequential_id", "updated_at") VALUES (?, ?, ?, ?, ?, ?)  [["address", nil], ["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["emailable_id", 1], ["emailable_type", "Question"], ["sequential_id", 3], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  Email Load (0.2ms)  SELECT "emails".* FROM "emails" WHERE "emails"."emailable_id" = 1 AND "emails"."emailable_type" = 'User' AND (sequential_id IS NOT NULL) ORDER BY sequential_id DESC LIMIT 1
+   (0.1ms)  SELECT COUNT(*) FROM "emails" WHERE "emails"."sequential_id" = 3 AND "emails"."emailable_id" = 1 AND "emails"."emailable_type" = 'User'
+  SQL (0.2ms)  INSERT INTO "emails" ("address", "created_at", "emailable_id", "emailable_type", "sequential_id", "updated_at") VALUES (?, ?, ?, ?, ?, ?)  [["address", nil], ["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["emailable_id", 1], ["emailable_type", "User"], ["sequential_id", 3], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.6ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "questions" ("body", "created_at", "summary", "updated_at") VALUES (?, ?, ?, ?)  [["body", nil], ["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["summary", nil], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "answers" ("body", "created_at", "question_id", "sequential_id", "updated_at") VALUES (?, ?, ?, ?, ?)  [["body", nil], ["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["question_id", 1], ["sequential_id", 10], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  Answer Load (0.1ms)  SELECT "answers".* FROM "answers" WHERE "answers"."question_id" = 1 AND (sequential_id IS NOT NULL) ORDER BY sequential_id DESC LIMIT 1
+   (0.1ms)  SELECT COUNT(*) FROM "answers" WHERE "answers"."sequential_id" = 11 AND "answers"."question_id" = 1
+  SQL (0.2ms)  INSERT INTO "answers" ("body", "created_at", "question_id", "sequential_id", "updated_at") VALUES (?, ?, ?, ?, ?)  [["body", nil], ["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["question_id", 1], ["sequential_id", 11], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.5ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "questions" ("body", "created_at", "summary", "updated_at") VALUES (?, ?, ?, ?)  [["body", nil], ["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["summary", nil], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  Answer Load (0.1ms)  SELECT "answers".* FROM "answers" WHERE "answers"."question_id" = 1 AND (sequential_id IS NOT NULL) ORDER BY sequential_id DESC LIMIT 1
+   (0.1ms)  SELECT COUNT(*) FROM "answers" WHERE "answers"."sequential_id" = 1 AND "answers"."question_id" = 1
+  SQL (0.3ms)  INSERT INTO "answers" ("body", "created_at", "question_id", "sequential_id", "updated_at") VALUES (?, ?, ?, ?, ?)  [["body", nil], ["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["question_id", 1], ["sequential_id", 1], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  Answer Load (0.1ms)  SELECT "answers".* FROM "answers" WHERE "answers"."id" = ? LIMIT 1  [["id", 1]]
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  UPDATE "answers" SET "body" = 'Updated body', "updated_at" = '2013-04-12 01:33:10.706724' WHERE "answers"."id" = 1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.6ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "accounts" ("created_at", "name", "updated_at") VALUES (?, ?, ?)  [["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["name", nil], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.5ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "accounts" ("created_at", "name", "updated_at") VALUES (?, ?, ?)  [["created_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00], ["name", nil], ["updated_at", Fri, 12 Apr 2013 01:33:10 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (6.1ms)  rollback transaction

data/test/sequenced_test.rb

@@ -89,7 +89,7 @@ class SequencedTest < ActiveSupport::TestCase
     another_answer.save
     
     assert_equal 10, answer.sequential_id
-    assert_equal 11, another_answer.sequential_id
+    assert_equal 10, another_answer.sequential_id
   end
   
   test "model with a default scope for sorting" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequenced
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport