lib/sequenced/generator.rb in sequenced-3.2.0 vs lib/sequenced/generator.rb in sequenced-4.0.0

@@ -19,55 +19,58 @@
     def id_set?
       !record.send(column).nil?
     end
 
     def skip?
-      skip && skip.call(record)
+      skip&.call(record)
     end
 
     def next_id
       next_id_in_sequence.tap do |id|
         id += 1 until unique?(id)
       end
     end
 
     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(record.class.primary_key => record.id) if record.persisted?
         rel.where(column => id)
       end.count == 0
     end
 
-  private
+    private
 
     def lock_table
       if postgresql?
         record.class.connection.execute("LOCK TABLE #{record.class.table_name} IN EXCLUSIVE MODE")
       end
     end
 
     def postgresql?
       defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) &&
-        record.class.connection.kind_of?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+        record.class.connection.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
     end
 
     def base_relation
       record.class.base_class.unscoped
     end
 
     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
 
     def build_scope(*columns)
       rel = yield
@@ -76,8 +79,7 @@
     end
 
     def max(*values)
       values.to_a.max
     end
-
   end
 end