Standardize

Author: excid3

Gemfile

@@ -9,12 +9,12 @@ gem "appraisal"
 gem "standardrb"
 
 group :development, :test do
-  gem 'sqlite3', '~> 1.4.4'
+  gem "sqlite3", "~> 1.4.4"
   # gem 'mysql2'
-  gem 'pg'
-  gem 'net-imap'
-  gem 'net-pop'
-  gem 'net-smtp'
+  gem "pg"
+  gem "net-imap"
+  gem "net-pop"
+  gem "net-smtp"
 end
 
 # Declare any dependencies that are still in development here instead of in

Rakefile

@@ -1,57 +1,57 @@
 #!/usr/bin/env rake
 begin
-  require 'bundler/setup'
+  require "bundler/setup"
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
 end
 begin
-  require 'rdoc/task'
+  require "rdoc/task"
 rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
+  require "rdoc/rdoc"
+  require "rake/rdoctask"
   RDoc::Task = Rake::RDocTask
 end
 
 RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Sequenced'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_dir = "rdoc"
+  rdoc.title = "Sequenced"
+  rdoc.options << "--line-numbers"
+  rdoc.rdoc_files.include("README.rdoc")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
+require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
+  t.libs << "lib"
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
   t.verbose = false
 end
 
-task :default => :test
+task default: :test
 
 namespace :db do
   task :create do
     # File.expand_path is executed directory of generated Rails app
-    rakefile = File.expand_path('Rakefile', 'test/dummy/')
+    rakefile = File.expand_path("Rakefile", "test/dummy/")
     command = "rake -f '%s' db:create" % rakefile
     sh(command)
   end
 
   task :drop do
     # File.expand_path is executed directory of generated Rails app
-    rakefile = File.expand_path('Rakefile', 'test/dummy/')
+    rakefile = File.expand_path("Rakefile", "test/dummy/")
     command = "rake -f '%s' db:drop" % rakefile
     sh(command)
   end
 
   namespace :test do
     task :prepare do
       # File.expand_path is executed directory of generated Rails app
-      rakefile = File.expand_path('Rakefile', 'test/dummy/')
+      rakefile = File.expand_path("Rakefile", "test/dummy/")
       command = "rake -f '%s' db:test:prepare" % rakefile
       sh(command)
     end

lib/sequenced.rb

@@ -1,4 +1,4 @@
-require 'sequenced/generator'
-require 'sequenced/acts_as_sequenced'
+require "sequenced/generator"
+require "sequenced/acts_as_sequenced"
 
-ActiveRecord::Base.send(:include, Sequenced::ActsAsSequenced)
+ActiveRecord::Base.send(:include, Sequenced::ActsAsSequenced)

lib/sequenced/acts_as_sequenced.rb

@@ -1,5 +1,5 @@
-require 'active_support/core_ext/hash/slice'
-require 'active_support/core_ext/class/attribute_accessors'
+require "active_support/core_ext/hash/slice"
+require "active_support/core_ext/class/attribute_accessors"
 
 module Sequenced
   module ActsAsSequenced
@@ -51,7 +51,7 @@ def acts_as_sequenced(options = {})
         options = DEFAULT_OPTIONS.merge(options)
         column_name = options[:column]
 
-        if sequenced_options.any? {|options| options[:column] == column_name}
+        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

lib/sequenced/generator.rb

@@ -21,7 +21,7 @@ def id_set?
     end
 
     def skip?
-      skip && skip.call(record)
+      skip&.call(record)
     end
 
     def next_id
@@ -32,8 +32,11 @@ def next_id
 
     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)
@@ -44,7 +47,7 @@ def unique?(id)
       end.count == 0
     end
 
-  private
+    private
 
     def lock_table
       if postgresql?
@@ -54,7 +57,7 @@ def lock_table
 
     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
@@ -63,9 +66,9 @@ def base_relation
 
     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
 
@@ -78,6 +81,5 @@ def build_scope(*columns)
     def max(*values)
       values.to_a.max
     end
-
   end
 end

sequenced.gemspec

@@ -2,13 +2,13 @@ $:.push File.expand_path("../lib", __FILE__)
 require "sequenced/version"
 
 Gem::Specification.new do |s|
-  s.name        = "sequenced"
-  s.version     = Sequenced::VERSION
-  s.authors     = ["Derrick Reimer"]
-  s.licenses    = ['MIT']
-  s.email       = ["[email protected]"]
-  s.homepage    = "https://github.com/derrickreimer/sequenced"
-  s.summary     = "Generate scoped sequential IDs for ActiveRecord models"
+  s.name = "sequenced"
+  s.version = Sequenced::VERSION
+  s.authors = ["Derrick Reimer"]
+  s.licenses = ["MIT"]
+  s.email = ["[email protected]"]
+  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 -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

test/acts_as_sequenced_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 # Test Models:
 #
@@ -35,29 +35,29 @@ class ActsAsSequencedTest < ActiveSupport::TestCase
 
   test "lambda start_at" do
     account = Account.create
-    product = Product.create(:account_id => account.id)
+    product = Product.create(account_id: account.id)
     assert_equal 3, product.sequential_id
 
-    another_product = Product.create(:account_id => account.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)
+    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)
+    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.create(sequential_id: 1)
     subscription = Subscription.create
     assert_equal 2, subscription.sequential_id
   end
@@ -93,8 +93,8 @@ class ActsAsSequencedTest < ActiveSupport::TestCase
 
   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 = question.answers.build(sequential_id: 10)
+    another_answer = question.answers.build(sequential_id: 10)
     answer.save
     another_answer.save
 
@@ -104,23 +104,23 @@ class ActsAsSequencedTest < ActiveSupport::TestCase
 
   test "model with a default scope for sorting" do
     question = Question.create
-    (1..3).each { |id| question.comments.create(:sequential_id => id) }
+    (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")
+    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)
+    rating = Rating.create(comment_id: 1, score: 1)
     assert_equal 1, rating.sequential_id
 
-    rating = Rating.create(:comment_id => 1, :score => 0)
+    rating = Rating.create(comment_id: 1, score: 0)
     assert_nil rating.sequential_id
   end
 

test/concurrency_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 # Test Models:
 #
@@ -20,7 +20,7 @@
 #                      NOT NULL constraint on sequential_id,
 #                      UNIQUE constraint on sequential_id within concurrent_burrow_id scope
 
-if ENV['DB'] == 'postgresql'
+if ENV["DB"] == "postgresql"
   class ConcurrencyTest < ActiveSupport::TestCase
     self.use_transactional_tests = false
 

test/dummy/Rakefile

@@ -2,6 +2,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require File.expand_path("../config/application", __FILE__)
 
 Dummy::Application.load_tasks

test/dummy/app/models/address.rb

@@ -1,4 +1,4 @@
 class Address < ActiveRecord::Base
   belongs_to :account
-  acts_as_sequenced :scope => :account_id
+  acts_as_sequenced scope: :account_id
 end

test/dummy/app/models/answer.rb

@@ -1,4 +1,4 @@
 class Answer < ActiveRecord::Base
   belongs_to :question
-  acts_as_sequenced :scope => :question_id
+  acts_as_sequenced scope: :question_id
 end

test/dummy/app/models/comment.rb

@@ -1,7 +1,7 @@
 class Comment < ActiveRecord::Base
   belongs_to :question
-  acts_as_sequenced :scope => :question_id
-  
+  acts_as_sequenced scope: :question_id
+
   def self.default_scope
     order("question_id ASC")
   end

test/dummy/app/models/email.rb

@@ -1,4 +1,4 @@
 class Email < ActiveRecord::Base
-  belongs_to :emailable, :polymorphic => true
-  acts_as_sequenced :scope => [:emailable_id, :emailable_type]
+  belongs_to :emailable, polymorphic: true
+  acts_as_sequenced scope: [:emailable_id, :emailable_type]
 end

test/dummy/app/models/invoice.rb

@@ -1,4 +1,4 @@
 class Invoice < ActiveRecord::Base
   belongs_to :account
-  acts_as_sequenced :scope => :account_id, :start_at => 1000
+  acts_as_sequenced scope: :account_id, start_at: 1000
 end

test/dummy/app/models/order.rb

@@ -1,4 +1,4 @@
 class Order < ActiveRecord::Base
   belongs_to :account
-  acts_as_sequenced :scope => :non_existent_column
+  acts_as_sequenced scope: :non_existent_column
 end

test/dummy/app/models/product.rb

@@ -1,7 +1,7 @@
 class Product < ActiveRecord::Base
   belongs_to :account
-  acts_as_sequenced :scope => :account_id, :start_at => lambda { |r| r.computed_start_value }
-  
+  acts_as_sequenced scope: :account_id, start_at: lambda { |r| r.computed_start_value }
+
   def computed_start_value
     1 + 2
   end

test/dummy/app/models/rating.rb

@@ -1,3 +1,3 @@
 class Rating < ActiveRecord::Base
-  acts_as_sequenced :scope => :comment_id, :skip => lambda { |r| r.score == 0 }
+  acts_as_sequenced scope: :comment_id, skip: lambda { |r| r.score == 0 }
 end

test/dummy/app/models/user.rb

@@ -1,4 +1,4 @@
 class User < ActiveRecord::Base
   belongs_to :account
-  acts_as_sequenced :scope => :account_id, :column => :custom_sequential_id
+  acts_as_sequenced scope: :account_id, column: :custom_sequential_id
 end

test/dummy/app/models/werewolf.rb

@@ -1,2 +1,2 @@
 class Werewolf < Monster
-end
+end

test/dummy/app/models/with_custom_primary_key.rb

@@ -2,5 +2,5 @@ class WithCustomPrimaryKey < ActiveRecord::Base
   self.primary_key = :legacy_id
 
   belongs_to :account
-  acts_as_sequenced :scope => :account_id
+  acts_as_sequenced scope: :account_id
 end

test/dummy/app/models/zombie.rb

@@ -1,2 +1,2 @@
 class Zombie < Monster
-end
+end

test/dummy/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path("../config/environment", __FILE__)
 run Dummy::Application