active_sort_order 0.9.0 → 0.9.4

data/test/test_helper.rb

@@ -3,6 +3,16 @@ ENV["RAILS_ENV"] = "test"
 
 require "active_sort_order"
 
+begin
+  require 'warning'
+
+  Warning.ignore(
+    %r{mail/parsers/address_lists_parser}, ### Hide mail gem warnings
+  )
+rescue LoadError
+  # Do nothing
+end
+
 ### Instantiates Rails
 require File.expand_path("../dummy_app/config/environment.rb",  __FILE__)
 
@@ -34,12 +44,12 @@ else
 end
 
 [Post].each do |klass|
-  ### REGULAR SQL
-  #ActiveRecord::Base.connection.execute("TRUNCATE TABLE #{klass.table_name}")
-  
-  ### SQLITE
-  ActiveRecord::Base.connection.execute("DELETE FROM #{klass.table_name};")
-  ActiveRecord::Base.connection.execute("UPDATE `sqlite_sequence` SET `seq` = 0 WHERE `name` = '#{klass.table_name}';")
+  if defined?(SQLite3)
+    ActiveRecord::Base.connection.execute("DELETE FROM #{klass.table_name};")
+    ActiveRecord::Base.connection.execute("UPDATE `sqlite_sequence` SET `seq` = 0 WHERE `name` = '#{klass.table_name}';")
+  else
+    ActiveRecord::Base.connection.execute("TRUNCATE TABLE #{klass.table_name}")
+  end
 end
 
 DATA = {}.with_indifferent_access

data/test/unit/active_sort_order_test.rb

@@ -2,10 +2,10 @@ require "test_helper"
 
 class ActiveSortOrderTest < ActiveSupport::TestCase
 
-  def setup
+  setup do
   end
 
-  def teardown
+  teardown do
   end
 
   def test_exposes_main_module
@@ -16,6 +16,14 @@ class ActiveSortOrderTest < ActiveSupport::TestCase
     assert ActiveSortOrder::VERSION
   end
 
+  def test_base_sort_order_default_value
+    klass = PostWithBaseOrderA
+
+    assert PostWithBaseOrderA.unscoped.sort_order.to_sql.include?("ORDER BY #{klass.base_sort_order}")
+
+    assert PostWithBaseOrderA.unscoped.sort_order(base_sort_order: true).to_sql.include?("ORDER BY #{klass.base_sort_order}")
+  end
+
   def test_class_base_sort_order_only
     assert_equal Post.all.count, DATA[:posts].count
 
@@ -67,7 +75,7 @@ class ActiveSortOrderTest < ActiveSupport::TestCase
 
     ### NIL & FALSE
     [nil, false].each do |v|
-      sorted = PostWithBaseOrderA.order(a: :desc).sort_order(base_sort_order: v)
+      sorted = PostWithBaseOrderA.order(id: :asc).sort_order(base_sort_order: v)
 
       sorted.each_with_index do |item, i|
         assert_equal expected[i].id, item.id
@@ -113,4 +121,24 @@ class ActiveSortOrderTest < ActiveSupport::TestCase
     end
   end
 
+  def test_sort_on_multiple_fields
+    assert_equal Post.all.count, DATA[:posts].count
+
+    expected = DATA[:posts].sort_by{|item| [item.b, item.a] }
+
+    sorted = PostWithBaseOrderA.all.sort_order([:b, :a], :asc)
+
+    sorted.each_with_index do |item, i|
+      assert_equal expected[i].id, item.id
+    end
+
+    expected = DATA[:posts].sort_by{|item| [item.b, item.a] }.reverse
+
+    sorted = PostWithBaseOrderA.all.sort_order([:b, :a], :desc)
+
+    sorted.each_with_index do |item, i|
+      assert_equal expected[i].id, item.id
+    end
+  end
+
 end

data/test/unit/errors_test.rb

@@ -2,10 +2,10 @@ require "test_helper"
 
 class ActiveSortOrderTest < ActiveSupport::TestCase
 
-  def setup
+  setup do
   end
 
-  def teardown
+  teardown do
   end
   
   def test_sort_str_errors
@@ -15,6 +15,8 @@ class ActiveSortOrderTest < ActiveSupport::TestCase
       :foo,
       nil,
       "",
+      [],
+      [:foo],
     ]
 
     valid.each do |v|
@@ -25,10 +27,13 @@ class ActiveSortOrderTest < ActiveSupport::TestCase
     invalid = [
       true,
       false,
-      [],
       Object.new,
     ]
 
+    if RUBY_VERSION.to_f >= 3.0
+      invalid << {}
+    end
+
     invalid.each do |v|
       assert_raise ArgumentError do
         Post.sort_order(v, :asc).limit(1)
@@ -41,16 +46,18 @@ class ActiveSortOrderTest < ActiveSupport::TestCase
 
     ### TEST UNIQUE CASES
 
-    ### HASH - this is allowed because its treated as keyword arguments
-    Post.sort_order({}).limit(1)
+    if RUBY_VERSION.to_f < 3.0
+      ### HASH - this is allowed because its treated as keyword arguments
+      Post.sort_order({}).limit(1)
 
-    assert_raise do
-      Post.sort_order({}, :desc).limit(1)
+      assert_raise do
+        Post.sort_order({}, :desc).limit(1)
+      end
     end
   end
 
   def test_sort_direction_errors
-    valid_directions = [
+    valid = [
       "ASC",
       "DESC",
       "ASC NULLS FIRST",
@@ -67,7 +74,7 @@ class ActiveSortOrderTest < ActiveSupport::TestCase
       "ASC\tNULLS\tFirst",
     ].freeze
 
-    valid_directions.each do |direction|
+    valid.each do |direction|
       PostWithBaseOrderA.sort_order("x", direction).limit(1)
 
       if direction
@@ -81,15 +88,19 @@ class ActiveSortOrderTest < ActiveSupport::TestCase
       end
     end
 
-    bad_directions = [
+    invalid = [
       false,
       true,
       Object.new,
       [],
       'ASCC',
-    ].freeze
+    ]
+
+    if RUBY_VERSION.to_f >= 3.0
+      invalid << {}
+    end
 
-    bad_directions.each do |direction|
+    invalid.each do |direction|
       assert_raise ArgumentError do
         PostWithBaseOrderA.sort_order("foobar", direction).limit(1)
       end
@@ -97,17 +108,22 @@ class ActiveSortOrderTest < ActiveSupport::TestCase
 
     ### TEST UNIQUE CASES
 
-    ### HASH - this is allowed because its treated as keyword arguments
-    Post.sort_order("foobar", {}).limit(1).to_sql.include?("foobar ASC")
+    if RUBY_VERSION.to_f < 3.0
+      ### HASH - this is allowed because its treated as keyword arguments
+      Post.sort_order("foobar", {}).limit(1).to_sql.include?("foobar ASC")
 
-    assert_raise do
-      Post.sort_order("foobar", {}, {}).limit(1)
+      assert_raise do
+        Post.sort_order("foobar", {}, {}).limit(1)
+      end
     end
   end
 
-  def test_base_sort_order_errors
+  def test_argument_base_sort_order_errors
+    assert_not Post.respond_to?(:base_sort_order)
+
     valid = [
       nil,
+      true,
       false,
       "",
       "foobar",
@@ -129,8 +145,13 @@ class ActiveSortOrderTest < ActiveSupport::TestCase
         Post.sort_order(base_sort_order: v).limit(1)
       end
     end
+  end
+
+  def test_class_method_base_sort_order_errors
+    klass = PostWithVolatileBaseOrder
+
+    assert klass.respond_to?(:base_sort_order)
 
-    ### INVALID BASE_SORT_ORDER CLASS
     valid = [
       nil,
       false,
@@ -140,15 +161,22 @@ class ActiveSortOrderTest < ActiveSupport::TestCase
 
     valid.each do |v|
       silence_warnings do
-        PostWithVolatileBaseOrder.define_method :base_sort_order do
+        klass.define_singleton_method :base_sort_order do
           v
         end
       end
 
-      PostWithVolatileBaseOrder.sort_order(base_sort_order: v).limit(1)
+      if v.nil?
+        assert_nil klass.base_sort_order
+      else
+        assert_equal v, klass.base_sort_order
+      end
+
+      klass.sort_order.limit(1)
     end
 
     invalid = [
+      true,
       :foobar,
       [],
       {},
@@ -157,13 +185,19 @@ class ActiveSortOrderTest < ActiveSupport::TestCase
 
     invalid.each do |v|
       silence_warnings do
-        PostWithVolatileBaseOrder.define_method :base_sort_order do
+        klass.define_singleton_method :base_sort_order do
           v
         end
       end
 
+      if v.nil?
+        assert_nil klass.base_sort_order
+      else
+        assert_equal v, klass.base_sort_order
+      end
+
       assert_raise ArgumentError do
-        PostWithVolatileBaseOrder.sort_order(base_sort_order: v).limit(1)
+        klass.sort_order.limit(1)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_sort_order
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.4
 platform: ruby
 authors:
 - Weston Ganger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-29 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,29 +16,16 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: railties
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Dead simple, fully customizable sorting pattern for ActiveRecord.
+        version: '5'
+description: The "easy-peasy" dynamic sorting pattern for ActiveRecord that your Rails
+  apps deserve.
 email:
 - weston@westonganger.com
 executables: []
@@ -64,7 +51,6 @@ files:
 - test/dummy_app/app/models/post_with_base_order_b.rb
 - test/dummy_app/app/models/post_with_base_order_b_and_a.rb
 - test/dummy_app/app/models/post_with_volatile_base_order.rb
-- test/dummy_app/app/models/test_helper.rb
 - test/dummy_app/app/views/layouts/application.html.erb
 - test/dummy_app/config.ru
 - test/dummy_app/config/application.rb
@@ -104,53 +90,53 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
-summary: Dead simple, fully customizable sorting pattern for ActiveRecord.
+summary: The "easy-peasy" dynamic sorting pattern for ActiveRecord that your Rails
+  apps deserve.
 test_files:
-- test/test_helper.rb
 - test/unit/active_sort_order_test.rb
 - test/unit/errors_test.rb
-- test/dummy_app/app/models/test_helper.rb
-- test/dummy_app/app/models/post_with_volatile_base_order.rb
-- test/dummy_app/app/models/post_with_base_order_a_and_b.rb
-- test/dummy_app/app/models/application_record.rb
+- test/test_helper.rb
 - test/dummy_app/app/models/post_with_base_order_b_and_a.rb
 - test/dummy_app/app/models/post_with_base_order_a.rb
+- test/dummy_app/app/models/post_with_base_order_a_and_b.rb
+- test/dummy_app/app/models/post_with_volatile_base_order.rb
 - test/dummy_app/app/models/post_with_base_order_b.rb
+- test/dummy_app/app/models/application_record.rb
 - test/dummy_app/app/models/post.rb
+- test/dummy_app/app/controllers/application_controller.rb
 - test/dummy_app/app/views/layouts/application.html.erb
-- test/dummy_app/app/assets/stylesheets/application.css
 - test/dummy_app/app/assets/config/manifest.js
 - test/dummy_app/app/assets/javascripts/application.js
-- test/dummy_app/app/controllers/application_controller.rb
-- test/dummy_app/config.ru
-- test/dummy_app/log/test.log
-- test/dummy_app/config/database.yml
+- test/dummy_app/app/assets/stylesheets/application.css
+- test/dummy_app/config/secrets.yml
+- test/dummy_app/config/routes.rb
+- test/dummy_app/config/locales/en.yml
 - test/dummy_app/config/environments/production.rb
-- test/dummy_app/config/environments/test.rb
 - test/dummy_app/config/environments/development.rb
-- test/dummy_app/config/routes.rb
+- test/dummy_app/config/environments/test.rb
 - test/dummy_app/config/environment.rb
-- test/dummy_app/config/locales/en.yml
+- test/dummy_app/config/application.rb
+- test/dummy_app/config/database.yml
 - test/dummy_app/config/boot.rb
-- test/dummy_app/config/initializers/secret_token.rb
-- test/dummy_app/config/initializers/inflections.rb
+- test/dummy_app/config/initializers/backtrace_silencers.rb
 - test/dummy_app/config/initializers/mime_types.rb
 - test/dummy_app/config/initializers/session_store.rb
 - test/dummy_app/config/initializers/wrap_parameters.rb
-- test/dummy_app/config/initializers/backtrace_silencers.rb
-- test/dummy_app/config/secrets.yml
-- test/dummy_app/config/application.rb
+- test/dummy_app/config/initializers/secret_token.rb
+- test/dummy_app/config/initializers/inflections.rb
+- test/dummy_app/config.ru
 - test/dummy_app/Rakefile
 - test/dummy_app/db/schema.rb
 - test/dummy_app/db/test.sqlite3
 - test/dummy_app/db/migrate/20210128155312_set_up_test_tables.rb
+- test/dummy_app/log/test.log