sequenced 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19469f53054a51802c23c141597b405b2d061b9e
-  data.tar.gz: 86e49028b4e37daf29ef770727d68e0edd096634
+  metadata.gz: 0706f251eb15142b2e59f24168bdfc83bbb86d51
+  data.tar.gz: e222ef16202f2703c315b107136687c5e484fe41
 SHA512:
-  metadata.gz: 3e98ddf8640a706f049d2295861792cd7b5e10d21e6c4d1591ed46126bf645590fb8ab00e3b9ded0c882bd5530d60deec9e013824f86d539e73e9c56a7fb9af5
-  data.tar.gz: cb58678c8d817b23677162008c60120f564f48b41713d9ecc9a97922ac74c1b7677c3691b5ab1661ce171e9c82c709fefcc48425773c74b5ac4d91caaf619896
+  metadata.gz: 6b2e5b704a339e4449d1ba8175bb72dc5e857450d693aed070304c61865d546bc3459e8412d7990ac112f8da0f3f4ff1d560f94be09c000c66a2bf4d5d6c6a9b
+  data.tar.gz: 601a93fee12817506cce21f0027eb89b35418cffe1cfa26183810fd59ae31adf435f609d53ffb92e1e3c9ae3cfff6e5d281b9636c4045ff762d79fde4ae46d2d

data/CHANGELOG.md

@@ -1,8 +1,14 @@
+3.1.0 (January 23, 2016)
+-------------------------
+
+* Allow multiple sequences on one record
+  (samphilipd, [#19](https://github.com/djreimer/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/djreimer/sequenced/pull/16))
 
 2.0.0 (October 24, 2014)
 ------------------------

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2015 Derrick Reimer
+Copyright 2016 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

@@ -70,6 +70,18 @@ class Answer < ActiveRecord::Base
 end
 ```
 
+Multiple sequences can be defined by using the macro multiple times:
+
+```ruby
+class Answer < ActiveRecord::Base
+  belongs_to :account
+  belongs_to :question
+
+  acts_as_sequenced column: :question_answer_number, scope: :question_id
+  acts_as_sequenced column: :account_answer_number, scope: :account_id
+end
+```
+
 ## Schema and data integrity
 
 **This gem is only concurrent-safe for PostgreSQL databases**. For other database systems, unexpected behavior may occur if you attempt to create records concurrently.

data/lib/sequenced/acts_as_sequenced.rb

@@ -3,6 +3,12 @@ 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,36 @@ 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 do
+            []
+          end
+
+          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,8 +5,8 @@ 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
 

data/lib/sequenced/version.rb

@@ -1,3 +1,3 @@
 module Sequenced
-  VERSION = "3.0.0"
+  VERSION = "3.1.0"
 end

data/test/dummy/app/models/doppelganger.rb

@@ -0,0 +1,4 @@
+class Doppelganger < ActiveRecord::Base
+  acts_as_sequenced column: :sequential_id_one
+  acts_as_sequenced column: :sequential_id_two, start_at: 1000
+end

data/test/dummy/config/environments/production.rb

@@ -9,7 +9,7 @@ Dummy::Application.configure do
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS
   config.assets.compress = true

data/test/dummy/config/environments/test.rb

@@ -9,7 +9,7 @@ Dummy::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
 
   # Log error messages when you accidentally call methods on nil
@@ -38,4 +38,6 @@ Dummy::Application.configure do
 
   # Required for Rails >= 4.2
   config.eager_load = true
+
+  config.active_support.test_order = :random
 end

data/test/dummy/db/migrate/20160118182655_create_doppelgangers.rb

@@ -0,0 +1,10 @@
+class CreateDoppelgangers < ActiveRecord::Migration
+  def change
+    create_table :doppelgangers do |t|
+      t.integer :sequential_id_one
+      t.integer :sequential_id_two
+
+      t.timestamps null: false
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,22 +11,22 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20130715002029) do
+ActiveRecord::Schema.define(version: 20160118182655) do
 
-  create_table "accounts", force: true do |t|
+  create_table "accounts", force: :cascade do |t|
     t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "addresses", force: true do |t|
+  create_table "addresses", force: :cascade do |t|
     t.integer  "account_id"
     t.string   "city"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "answers", force: true do |t|
+  create_table "answers", force: :cascade do |t|
     t.integer  "question_id"
     t.text     "body"
     t.integer  "sequential_id"
@@ -37,7 +37,7 @@ ActiveRecord::Schema.define(version: 20130715002029) do
   add_index "answers", ["question_id"], name: "index_answers_on_question_id"
   add_index "answers", ["sequential_id"], name: "index_answers_on_sequential_id"
 
-  create_table "comments", force: true do |t|
+  create_table "comments", force: :cascade do |t|
     t.integer  "question_id"
     t.text     "body"
     t.integer  "sequential_id"
@@ -47,7 +47,21 @@ ActiveRecord::Schema.define(version: 20130715002029) do
 
   add_index "comments", ["question_id"], name: "index_comments_on_question_id"
 
-  create_table "emails", force: true do |t|
+  create_table "concurrent_badgers", force: :cascade do |t|
+    t.integer "sequential_id", null: false
+    t.integer "burrow_id"
+  end
+
+  add_index "concurrent_badgers", ["sequential_id", "burrow_id"], name: "unique_concurrent", unique: true
+
+  create_table "doppelgangers", force: :cascade do |t|
+    t.integer  "sequential_id_one"
+    t.integer  "sequential_id_two"
+    t.datetime "created_at",        null: false
+    t.datetime "updated_at",        null: false
+  end
+
+  create_table "emails", force: :cascade do |t|
     t.string   "emailable_type"
     t.integer  "emailable_id"
     t.integer  "sequential_id"
@@ -56,7 +70,7 @@ ActiveRecord::Schema.define(version: 20130715002029) do
     t.datetime "updated_at"
   end
 
-  create_table "invoices", force: true do |t|
+  create_table "invoices", force: :cascade do |t|
     t.integer  "amount"
     t.integer  "sequential_id"
     t.integer  "account_id"
@@ -66,21 +80,41 @@ ActiveRecord::Schema.define(version: 20130715002029) do
 
   add_index "invoices", ["account_id"], name: "index_invoices_on_account_id"
 
-  create_table "orders", force: true do |t|
+  create_table "monsters", force: :cascade do |t|
+    t.integer  "sequential_id"
+    t.string   "type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "orders", force: :cascade do |t|
     t.string   "product"
     t.integer  "account_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "questions", force: true do |t|
+  create_table "policemen", force: :cascade do |t|
+    t.integer  "sequential_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "products", force: :cascade do |t|
+    t.integer  "account_id"
+    t.integer  "sequential_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "questions", force: :cascade do |t|
     t.string   "summary"
     t.text     "body"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "ratings", force: true do |t|
+  create_table "ratings", force: :cascade do |t|
     t.integer  "comment_id"
     t.integer  "score"
     t.integer  "sequential_id"
@@ -88,14 +122,14 @@ ActiveRecord::Schema.define(version: 20130715002029) do
     t.datetime "updated_at"
   end
 
-  create_table "subscriptions", force: true do |t|
+  create_table "subscriptions", force: :cascade do |t|
     t.string   "plan"
     t.integer  "sequential_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "users", force: true do |t|
+  create_table "users", force: :cascade do |t|
     t.integer  "account_id"
     t.string   "name"
     t.integer  "custom_sequential_id"

data/test/multiple_sequences_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class MultipleSequencesTest < ActiveSupport::TestCase
+  test "works with simple multiple sequences" do
+    doppelganger = Doppelganger.create!
+    assert_equal 1, doppelganger.sequential_id_one
+    assert_equal 1000, doppelganger.sequential_id_two
+  end
+
+  test "raises error on multiple definitions for the same column" do
+    assert_raise Sequenced::ActsAsSequenced::SequencedColumnExists do
+      Doppelganger.class_eval do
+        acts_as_sequenced column: :sequential_id_one, start_at: 99
+      end
+    end
+
+    doppelganger = Doppelganger.create!
+    assert_equal 1, doppelganger.sequential_id_one
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequenced
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Derrick Reimer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-28 00:00:00.000000000 Z
+date: 2016-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -87,6 +87,7 @@ files:
 - 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
@@ -132,6 +133,7 @@ files:
 - 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
@@ -143,6 +145,7 @@ files:
 - 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
 licenses:
@@ -180,6 +183,7 @@ test_files:
 - 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
@@ -225,6 +229,7 @@ test_files:
 - 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
@@ -236,5 +241,5 @@ test_files:
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
 - test/dummy/script/rails
+- test/multiple_sequences_test.rb
 - test/test_helper.rb
-has_rdoc: