sequence_on 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 347fdd365e120101402acfd7bc501502a7298ecf
-  data.tar.gz: e5ef400318ea5e1cbf3f2c79d53f654c8db48076
+  metadata.gz: 435e96d6c211ac5457fd9281370e48645fbce435
+  data.tar.gz: c43524bd0d6fe081b126040c096b8ce8720fc982
 SHA512:
-  metadata.gz: 35d70739e173a97bb1af6f68c5f110fc956d5977669f106124242b9d8fda8b91c80a3f8a5a39435243afa55177c8af4ad6037623349d9730cde3ee6c09788ac0
-  data.tar.gz: df53d0d71df3091c598a8dc36c1677e68e2268900b4bc62f0d3f5922db5e156891f49e12e65a25b71fbe40fb18662cefc90ac15c0180c4130dc436638fb7a215
+  metadata.gz: b15f347b9b90370735c8c23ec15ea88fdf12652654ae07c006c02602b3788d1b88c63a29e6b340e73ca8eb811b0119da01b3d2d8f1c029d6caecb67da8823d0b
+  data.tar.gz: 58cc6f67aca213d3d5af2cb309fdf068b4184ebe8ba9ed388fb3b51041dc265b968ab0fbdd525aea0961f9d18141ddce29b93476e6e5b85fe8eb39acec0498bb

data/lib/sequence_on/sequenced_on.rb

@@ -0,0 +1,50 @@
+require 'active_support/core_ext/hash/slice'
+require 'active_support/core_ext/class/attribute_accessors'
+
+module SequenceOn
+
+  module SequencedOn
+
+    DEFAULT_OPTIONS = {
+      column: :sequential_id,
+      start_at: 1
+    }.freeze
+
+    module InstanceMethods
+
+      private
+
+      def postgresql?
+        defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) &&
+          self.class.connection.instance_of?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+      end
+
+      def generate_sequence_id
+        options = self.class.sequence_options
+        self.class.connection.execute("LOCK TABLE #{self.class.table_name} IN EXCLUSIVE MODE") if postgresql?
+        last_record = self.class.class_exec(self, &options[:lmd]).
+          order("#{options[:column]} DESC").
+          first
+        self.sequential_id = if last_record
+                               last_record.send(options[:column]) + 1
+                             else
+                               options[:start_at]
+                             end
+      end
+    end
+
+    module ClassMethods
+
+      def sequenced_on(lmd, options = {})
+        include InstanceMethods
+        mattr_accessor :sequence_options, instance_accessor: false
+        before_create :generate_sequence_id, prepend: true
+        self.sequence_options = DEFAULT_OPTIONS.merge(options).merge(lmd: lmd)
+      end
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+  end
+end

data/lib/sequence_on.rb

@@ -1,36 +1,3 @@
-module SequencedOn
-  extend ActiveSupport::Concern
+require 'sequence_on/sequenced_on'
 
-  class_methods do
-
-    def sequence_on(l, opts={})
-      @@seq_on = l
-      @@seq_on_opts = opts
-    end
-  end
-
-  included do
-    before_create :generate_sequence_id, prepend: true
-
-    private
-
-    def postgresql?
-      defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) &&
-        self.class.connection.instance_of?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
-    end
-
-    def generate_sequence_id
-      if postgresql?
-        self.class.connection.execute("LOCK TABLE #{self.class.table_name} IN EXCLUSIVE MODE")
-      end
-      last_record = self.class.class_exec(self, &@@seq_on).
-        order("sequential_id DESC").
-        first
-      self.sequential_id = if last_record
-                             last_record.sequential_id + 1
-                           else
-                             @@seq_on_opts[:starts_at] || 1
-                           end
-    end
-  end
-end
+ActiveRecord::Base.send(:include, SequenceOn::SequencedOn)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequence_on
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jeremy SEBAN
@@ -9,7 +9,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2017-05-18 00:00:00.000000000 Z
-dependencies: []
+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: Flexible acts_as_sequenced replacement
 email: tech@qonto.eu
 executables: []
@@ -17,6 +59,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/sequence_on.rb
+- lib/sequence_on/sequenced_on.rb
 homepage: https://github.com/qonto/sequence_on
 licenses:
 - MIT