active_sort_order 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 344ed5136f8ac05c4dcb05fbd86dce86ee2ffc7e5a97b693057668cd8fe5dd6d
-  data.tar.gz: 8a11524e7c75f247213c2cb01b7f7838f797258b02147ac7b784da79c02d0aeb
+  metadata.gz: '089c16d2abd0a4aeb75c3a377d54f70883a7397758841c55f7bb64940cb3b205'
+  data.tar.gz: caf3be0137352d2c1df913f9bdf6749253d15e7ed852d1bba646a2ce58fe90f4
 SHA512:
-  metadata.gz: 4de7def8d5b3c503aac5198773f6ab0b3ae020462a95699238e347911efea050636192eb7382e83a875faaeeaa7e07ab425a74aa8351eda471f6fbbd2a56c91d
-  data.tar.gz: 77a40b71113c7b01076d1af3cef0304b078b0c86436f889b3583303a7d7ee52fb800de94ca38b6a13f196d9cb23c3850c91bef4306c6f2fb0639c090b4591d1f
+  metadata.gz: aaf7872401a767653abe756bc53955e2daa7df56cc1c37a204feff1f409290b0b11ea6cd9afc6e2376992e7be594f6d7c63add7f47e5ebee042fa9092f2dda1a
+  data.tar.gz: aff10d7f87d429fe6e6e3c14a1697d2641eaf7a2cd427475c79d6f803bcbca64a47861d8e0f93de79e26ed8c44fa9267b981cd5e5b83a4cf40ae3dd0c92b47bf

data/CHANGELOG.md

@@ -2,7 +2,7 @@ CHANGELOG
 ---------
 
 - **Unreleased - [View Diff](https://github.com/westonganger/active_sort_order/compare/v0.9.2...master)**
-  * Nothing yet
+  * Allow ability to sort on multiple fields
 
 - **v0.9.2 - Apr 28, 2021 - [View Diff](https://github.com/westonganger/active_sort_order/compare/v0.9.1...v0.9.2)**
   * Fix deprecation warning in Rails 6.1 for `reorder(nil)`

data/README.md

@@ -36,8 +36,12 @@ In the below examples we are within a controller and are using the params as our
 ```ruby
 # app/controllers/posts_controller.rb
 
-if params[:sort] == "number_str"
+case params[:sort]
+when "number_str"
   sort_col_sql = "CAST(posts.number_str AS int)"
+when "user"
+  ### To sort on multiple fields pass in an Array
+  sort_col_sql = ["users.first_name", "users.last_name"] 
 else
   sort_col_sql = params[:sort]
 end
@@ -49,6 +53,8 @@ Post.all.sort_order(sort_col_sql, params[:direction], base_sort_order: "lower(nu
 Post.all.sort_order(sort_col_sql, params[:direction]) 
 ```
 
+## Sorting on multiple columns
+
 ##### Method Definition:
 
 `sort_order(sort_col_sql = nil, sort_direction_sql = nil, base_sort_order: true)`

data/lib/active_sort_order/concerns/sort_order_concern.rb

@@ -5,12 +5,12 @@ module ActiveSortOrder
     included do
       
       scope :sort_order, ->(sort_col_sql = nil, sort_direction_sql = nil, base_sort_order: true){
-        if [String, Symbol, NilClass].exclude?(sort_col_sql.class)
-          raise ArgumentError.new("Invalid first argument `sort_col_sql`, expecting a a String or Symbol")
-        end
-
         if sort_col_sql.present?
-          sort_col_sql = sort_col_sql.to_s
+          if sort_col_sql.is_a?(Array)
+            sort_col_sql = sort_col_sql.map{|x| x.to_s }
+          else
+            sort_col_sql = sort_col_sql.to_s
+          end
 
           ### SORT DIRECTION HANDLING
           if sort_direction_sql.is_a?(Symbol)
@@ -20,7 +20,7 @@ module ActiveSortOrder
           if sort_direction_sql.nil? || (sort_direction_sql.is_a?(String) && sort_direction_sql == "")
             sort_direction_sql = "ASC"
           elsif !sort_direction_sql.is_a?(String)
-            raise ArgumentError.new("Invalid second argument `sort_direction_sql`, expecting a a String or Symbol")
+            raise ArgumentError.new("Invalid second argument `sort_direction_sql`, expecting a String or Symbol")
           else
             valid_directions = [
               "ASC",
@@ -41,7 +41,11 @@ module ActiveSortOrder
             end
           end
 
-          sql_str = "#{sort_col_sql} #{sort_direction_sql}"
+          if !sort_col_sql.is_a?(Array)
+            sort_col_sql = [sort_col_sql]
+          end
+
+          sql_str = sort_col_sql.map{|x| "#{x} #{sort_direction_sql}" }.join(", ")
         end
         
         ### BASE SORT ORDER HANDLING

data/lib/active_sort_order/version.rb

@@ -1,3 +1,3 @@
 module ActiveSortOrder
-  VERSION = "0.9.2".freeze
+  VERSION = "0.9.3".freeze
 end

data/test/dummy_app/log/test.log

@@ -201,3 +201,342 @@ ActiveSortOrderTest: test_argument_base_sort_order_errors
 ActiveSortOrderTest: test_sort_direction_errors
 -----------------------------------------------
   TRANSACTION (0.1ms)  rollback transaction
+   (1.1ms)  SELECT sqlite_version(*)
+   (0.6ms)  SELECT "ar_internal_metadata"."value" FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ?  [["key", "schema_sha1"]]
+   (0.1ms)  SELECT sqlite_version(*)
+   (0.5ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+  ActiveRecord::InternalMetadata Load (0.6ms)  SELECT "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+   (1.6ms)  DELETE FROM posts;
+   (1.3ms)  UPDATE `sqlite_sequence` SET `seq` = 0 WHERE `name` = 'posts';
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."a" = ? AND "posts"."b" = ? LIMIT ?  [["a", 1], ["b", 3], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  Post Create (0.3ms)  INSERT INTO "posts" ("a", "b") VALUES (?, ?)  [["a", 1], ["b", 3]]
+  TRANSACTION (0.8ms)  commit transaction
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."a" = ? AND "posts"."b" = ? LIMIT ?  [["a", 2], ["b", 2], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  Post Create (0.2ms)  INSERT INTO "posts" ("a", "b") VALUES (?, ?)  [["a", 2], ["b", 2]]
+  TRANSACTION (0.6ms)  commit transaction
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."a" = ? AND "posts"."b" = ? LIMIT ?  [["a", 3], ["b", 2], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  Post Create (0.2ms)  INSERT INTO "posts" ("a", "b") VALUES (?, ?)  [["a", 3], ["b", 2]]
+  TRANSACTION (0.5ms)  commit transaction
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."a" = ? AND "posts"."b" = ? LIMIT ?  [["a", 4], ["b", 1], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  Post Create (0.2ms)  INSERT INTO "posts" ("a", "b") VALUES (?, ?)  [["a", 4], ["b", 1]]
+  TRANSACTION (0.7ms)  commit transaction
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."a" = ? AND "posts"."b" = ? LIMIT ?  [["a", 5], ["b", 1], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  Post Create (0.2ms)  INSERT INTO "posts" ("a", "b") VALUES (?, ?)  [["a", 5], ["b", 1]]
+  TRANSACTION (1.1ms)  commit transaction
+  TRANSACTION (0.1ms)  begin transaction
+-------------------------------------------------------
+ActiveSortOrderTest: test_override_base_sort_order_only
+-------------------------------------------------------
+   (0.1ms)  SELECT COUNT(*) FROM "posts"
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+-------------------------------------------------
+ActiveSortOrderTest: test_sort_on_multiple_fields
+-------------------------------------------------
+   (0.1ms)  SELECT COUNT(*) FROM "posts"
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+--------------------------------------------------
+ActiveSortOrderTest: test_base_sort_order_and_sort
+--------------------------------------------------
+   (0.1ms)  SELECT COUNT(*) FROM "posts"
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+----------------------------------------------------
+ActiveSortOrderTest: test_class_base_sort_order_only
+----------------------------------------------------
+   (0.1ms)  SELECT COUNT(*) FROM "posts"
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+---------------------------------------------
+ActiveSortOrderTest: test_exposes_main_module
+---------------------------------------------
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+-----------------------------------
+ActiveSortOrderTest: test_sort_only
+-----------------------------------
+   (0.1ms)  SELECT COUNT(*) FROM "posts"
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+-----------------------------------------
+ActiveSortOrderTest: test_exposes_version
+-----------------------------------------
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+-------------------------------------------------------
+ActiveSortOrderTest: test_base_sort_order_default_value
+-------------------------------------------------------
+  TRANSACTION (0.0ms)  rollback transaction
+  PostWithBaseOrderA Load (0.2ms)  SELECT "posts".* FROM "posts" /* loading for inspect */ ORDER BY "posts"."b" DESC LIMIT ?  [["LIMIT", 11]]
+  PostWithBaseOrderA Load (0.1ms)  SELECT "posts".* FROM "posts" /* loading for inspect */ ORDER BY "posts"."b" DESC LIMIT ?  [["LIMIT", 11]]
+  PostWithBaseOrderA Load (0.1ms)  SELECT "posts".* FROM "posts" /* loading for inspect */ LIMIT ?  [["LIMIT", 11]]
+  PostWithBaseOrderA Load (0.1ms)  SELECT "posts".* FROM "posts" /* loading for inspect */ LIMIT ?  [["LIMIT", 11]]
+  PostWithBaseOrderA Load (0.1ms)  SELECT "posts".* FROM "posts" /* loading for inspect */ LIMIT ?  [["LIMIT", 11]]
+  PostWithBaseOrderA Load (0.1ms)  SELECT "posts".* FROM "posts" /* loading for inspect */ LIMIT ?  [["LIMIT", 11]]
+  PostWithBaseOrderA Load (0.1ms)  SELECT "posts".* FROM "posts" /* loading for inspect */ LIMIT ?  [["LIMIT", 11]]
+  PostWithBaseOrderA Load (0.1ms)  SELECT "posts".* FROM "posts" /* loading for inspect */ LIMIT ?  [["LIMIT", 11]]
+  PostWithBaseOrderA Load (0.1ms)  SELECT "posts".* FROM "posts" /* loading for inspect */ LIMIT ?  [["LIMIT", 11]]
+  PostWithBaseOrderA Load (0.1ms)  SELECT "posts".* FROM "posts" /* loading for inspect */ LIMIT ?  [["LIMIT", 11]]
+   (0.7ms)  SELECT sqlite_version(*)
+   (0.1ms)  SELECT "ar_internal_metadata"."value" FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ?  [["key", "schema_sha1"]]
+   (0.0ms)  SELECT sqlite_version(*)
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+  ActiveRecord::InternalMetadata Load (0.1ms)  SELECT "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+   (1.8ms)  DELETE FROM posts;
+   (1.4ms)  UPDATE `sqlite_sequence` SET `seq` = 0 WHERE `name` = 'posts';
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."a" = ? AND "posts"."b" = ? LIMIT ?  [["a", 1], ["b", 3], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  Post Create (0.2ms)  INSERT INTO "posts" ("a", "b") VALUES (?, ?)  [["a", 1], ["b", 3]]
+  TRANSACTION (0.8ms)  commit transaction
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."a" = ? AND "posts"."b" = ? LIMIT ?  [["a", 2], ["b", 2], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  Post Create (0.2ms)  INSERT INTO "posts" ("a", "b") VALUES (?, ?)  [["a", 2], ["b", 2]]
+  TRANSACTION (0.7ms)  commit transaction
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."a" = ? AND "posts"."b" = ? LIMIT ?  [["a", 3], ["b", 2], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  Post Create (0.2ms)  INSERT INTO "posts" ("a", "b") VALUES (?, ?)  [["a", 3], ["b", 2]]
+  TRANSACTION (0.7ms)  commit transaction
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."a" = ? AND "posts"."b" = ? LIMIT ?  [["a", 4], ["b", 1], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  Post Create (0.2ms)  INSERT INTO "posts" ("a", "b") VALUES (?, ?)  [["a", 4], ["b", 1]]
+  TRANSACTION (0.7ms)  commit transaction
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."a" = ? AND "posts"."b" = ? LIMIT ?  [["a", 5], ["b", 1], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  Post Create (0.2ms)  INSERT INTO "posts" ("a", "b") VALUES (?, ?)  [["a", 5], ["b", 1]]
+  TRANSACTION (0.7ms)  commit transaction
+  TRANSACTION (0.0ms)  begin transaction
+---------------------------------------------
+ActiveSortOrderTest: test_exposes_main_module
+---------------------------------------------
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+-------------------------------------------------------
+ActiveSortOrderTest: test_override_base_sort_order_only
+-------------------------------------------------------
+   (0.1ms)  SELECT COUNT(*) FROM "posts"
+  PostWithBaseOrderA Load (0.1ms)  SELECT "posts".* FROM "posts" ORDER BY posts.b ASC
+  PostWithBaseOrderA Load (0.1ms)  SELECT "posts".* FROM "posts" ORDER BY "posts"."id" ASC
+  PostWithBaseOrderA Load (0.0ms)  SELECT "posts".* FROM "posts" ORDER BY "posts"."id" ASC
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+-----------------------------------
+ActiveSortOrderTest: test_sort_only
+-----------------------------------
+   (0.1ms)  SELECT COUNT(*) FROM "posts"
+  PostWithBaseOrderA Load (0.1ms)  SELECT "posts".* FROM "posts" ORDER BY a desc, posts.a ASC
+  PostWithBaseOrderA Load (0.1ms)  SELECT "posts".* FROM "posts" ORDER BY posts.a DESC, posts.a ASC
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+-----------------------------------------
+ActiveSortOrderTest: test_exposes_version
+-----------------------------------------
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+--------------------------------------------------
+ActiveSortOrderTest: test_base_sort_order_and_sort
+--------------------------------------------------
+   (0.1ms)  SELECT COUNT(*) FROM "posts"
+  PostWithBaseOrderA Load (0.1ms)  SELECT "posts".* FROM "posts" ORDER BY posts.a DESC, posts.a ASC
+  PostWithBaseOrderB Load (0.1ms)  SELECT "posts".* FROM "posts" ORDER BY posts.b DESC, posts.b ASC
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+-------------------------------------------------
+ActiveSortOrderTest: test_sort_on_multiple_fields
+-------------------------------------------------
+   (0.1ms)  SELECT COUNT(*) FROM "posts"
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+-------------------------------------------------------
+ActiveSortOrderTest: test_base_sort_order_default_value
+-------------------------------------------------------
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+----------------------------------------------------
+ActiveSortOrderTest: test_class_base_sort_order_only
+----------------------------------------------------
+   (0.1ms)  SELECT COUNT(*) FROM "posts"
+  PostWithBaseOrderA Load (0.1ms)  SELECT "posts".* FROM "posts" ORDER BY posts.a ASC
+  PostWithBaseOrderB Load (0.1ms)  SELECT "posts".* FROM "posts" ORDER BY posts.b ASC
+  PostWithBaseOrderAAndB Load (0.1ms)  SELECT "posts".* FROM "posts" ORDER BY posts.a ASC, posts.b ASC
+  PostWithBaseOrderBAndA Load (0.8ms)  SELECT "posts".* FROM "posts" ORDER BY posts.b ASC, posts.a ASC
+  TRANSACTION (0.1ms)  rollback transaction
+   (0.7ms)  SELECT sqlite_version(*)
+   (0.1ms)  SELECT "ar_internal_metadata"."value" FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ?  [["key", "schema_sha1"]]
+   (0.0ms)  SELECT sqlite_version(*)
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+  ActiveRecord::InternalMetadata Load (0.1ms)  SELECT "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+   (1.2ms)  DELETE FROM posts;
+   (0.9ms)  UPDATE `sqlite_sequence` SET `seq` = 0 WHERE `name` = 'posts';
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."a" = ? AND "posts"."b" = ? LIMIT ?  [["a", 1], ["b", 3], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  Post Create (0.2ms)  INSERT INTO "posts" ("a", "b") VALUES (?, ?)  [["a", 1], ["b", 3]]
+  TRANSACTION (0.7ms)  commit transaction
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."a" = ? AND "posts"."b" = ? LIMIT ?  [["a", 2], ["b", 2], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  Post Create (0.2ms)  INSERT INTO "posts" ("a", "b") VALUES (?, ?)  [["a", 2], ["b", 2]]
+  TRANSACTION (0.7ms)  commit transaction
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."a" = ? AND "posts"."b" = ? LIMIT ?  [["a", 3], ["b", 2], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  Post Create (0.2ms)  INSERT INTO "posts" ("a", "b") VALUES (?, ?)  [["a", 3], ["b", 2]]
+  TRANSACTION (0.7ms)  commit transaction
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."a" = ? AND "posts"."b" = ? LIMIT ?  [["a", 4], ["b", 1], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  Post Create (0.2ms)  INSERT INTO "posts" ("a", "b") VALUES (?, ?)  [["a", 4], ["b", 1]]
+  TRANSACTION (0.7ms)  commit transaction
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."a" = ? AND "posts"."b" = ? LIMIT ?  [["a", 5], ["b", 1], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  Post Create (0.2ms)  INSERT INTO "posts" ("a", "b") VALUES (?, ?)  [["a", 5], ["b", 1]]
+  TRANSACTION (0.7ms)  commit transaction
+  TRANSACTION (0.0ms)  begin transaction
+-----------------------------------
+ActiveSortOrderTest: test_sort_only
+-----------------------------------
+   (0.1ms)  SELECT COUNT(*) FROM "posts"
+  PostWithBaseOrderA Load (0.1ms)  SELECT "posts".* FROM "posts" ORDER BY a desc, posts.a ASC
+  PostWithBaseOrderA Load (0.0ms)  SELECT "posts".* FROM "posts" ORDER BY posts.a DESC, posts.a ASC
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+---------------------------------------------
+ActiveSortOrderTest: test_exposes_main_module
+---------------------------------------------
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+-----------------------------------------
+ActiveSortOrderTest: test_exposes_version
+-----------------------------------------
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+----------------------------------------------------
+ActiveSortOrderTest: test_class_base_sort_order_only
+----------------------------------------------------
+   (0.1ms)  SELECT COUNT(*) FROM "posts"
+  PostWithBaseOrderA Load (0.0ms)  SELECT "posts".* FROM "posts" ORDER BY posts.a ASC
+  PostWithBaseOrderB Load (0.1ms)  SELECT "posts".* FROM "posts" ORDER BY posts.b ASC
+  PostWithBaseOrderAAndB Load (0.1ms)  SELECT "posts".* FROM "posts" ORDER BY posts.a ASC, posts.b ASC
+  PostWithBaseOrderBAndA Load (0.1ms)  SELECT "posts".* FROM "posts" ORDER BY posts.b ASC, posts.a ASC
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+-------------------------------------------------------
+ActiveSortOrderTest: test_override_base_sort_order_only
+-------------------------------------------------------
+   (0.1ms)  SELECT COUNT(*) FROM "posts"
+  PostWithBaseOrderA Load (0.0ms)  SELECT "posts".* FROM "posts" ORDER BY posts.b ASC
+  PostWithBaseOrderA Load (0.0ms)  SELECT "posts".* FROM "posts" ORDER BY "posts"."id" ASC
+  PostWithBaseOrderA Load (0.0ms)  SELECT "posts".* FROM "posts" ORDER BY "posts"."id" ASC
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+-------------------------------------------------------
+ActiveSortOrderTest: test_base_sort_order_default_value
+-------------------------------------------------------
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+--------------------------------------------------
+ActiveSortOrderTest: test_base_sort_order_and_sort
+--------------------------------------------------
+   (0.1ms)  SELECT COUNT(*) FROM "posts"
+  PostWithBaseOrderA Load (0.0ms)  SELECT "posts".* FROM "posts" ORDER BY posts.a DESC, posts.a ASC
+  PostWithBaseOrderB Load (0.0ms)  SELECT "posts".* FROM "posts" ORDER BY posts.b DESC, posts.b ASC
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+-------------------------------------------------
+ActiveSortOrderTest: test_sort_on_multiple_fields
+-------------------------------------------------
+   (0.1ms)  SELECT COUNT(*) FROM "posts"
+  PostWithBaseOrderA Load (0.0ms)  SELECT "posts".* FROM "posts" ORDER BY b asc, a asc, posts.a ASC
+  PostWithBaseOrderA Load (0.0ms)  SELECT "posts".* FROM "posts" ORDER BY b desc, a desc, posts.a ASC
+  TRANSACTION (0.0ms)  rollback transaction
+   (0.7ms)  SELECT sqlite_version(*)
+   (0.1ms)  SELECT "ar_internal_metadata"."value" FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ?  [["key", "schema_sha1"]]
+   (0.0ms)  SELECT sqlite_version(*)
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+   (0.0ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+  ActiveRecord::InternalMetadata Load (0.1ms)  SELECT "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+   (1.3ms)  DELETE FROM posts;
+   (0.7ms)  UPDATE `sqlite_sequence` SET `seq` = 0 WHERE `name` = 'posts';
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."a" = ? AND "posts"."b" = ? LIMIT ?  [["a", 1], ["b", 3], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  Post Create (0.2ms)  INSERT INTO "posts" ("a", "b") VALUES (?, ?)  [["a", 1], ["b", 3]]
+  TRANSACTION (0.7ms)  commit transaction
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."a" = ? AND "posts"."b" = ? LIMIT ?  [["a", 2], ["b", 2], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  Post Create (0.2ms)  INSERT INTO "posts" ("a", "b") VALUES (?, ?)  [["a", 2], ["b", 2]]
+  TRANSACTION (0.6ms)  commit transaction
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."a" = ? AND "posts"."b" = ? LIMIT ?  [["a", 3], ["b", 2], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  Post Create (0.2ms)  INSERT INTO "posts" ("a", "b") VALUES (?, ?)  [["a", 3], ["b", 2]]
+  TRANSACTION (0.8ms)  commit transaction
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."a" = ? AND "posts"."b" = ? LIMIT ?  [["a", 4], ["b", 1], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  Post Create (0.2ms)  INSERT INTO "posts" ("a", "b") VALUES (?, ?)  [["a", 4], ["b", 1]]
+  TRANSACTION (0.7ms)  commit transaction
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."a" = ? AND "posts"."b" = ? LIMIT ?  [["a", 5], ["b", 1], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  Post Create (0.2ms)  INSERT INTO "posts" ("a", "b") VALUES (?, ?)  [["a", 5], ["b", 1]]
+  TRANSACTION (0.7ms)  commit transaction
+  TRANSACTION (0.0ms)  begin transaction
+-------------------------------------------------
+ActiveSortOrderTest: test_sort_on_multiple_fields
+-------------------------------------------------
+   (0.1ms)  SELECT COUNT(*) FROM "posts"
+  PostWithBaseOrderA Load (0.1ms)  SELECT "posts".* FROM "posts" ORDER BY b asc, a asc, posts.a ASC
+  PostWithBaseOrderA Load (0.0ms)  SELECT "posts".* FROM "posts" ORDER BY b desc, a desc, posts.a ASC
+  TRANSACTION (0.1ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+----------------------------------------------------
+ActiveSortOrderTest: test_class_base_sort_order_only
+----------------------------------------------------
+   (0.1ms)  SELECT COUNT(*) FROM "posts"
+  PostWithBaseOrderA Load (0.1ms)  SELECT "posts".* FROM "posts" ORDER BY posts.a ASC
+  PostWithBaseOrderB Load (0.1ms)  SELECT "posts".* FROM "posts" ORDER BY posts.b ASC
+  PostWithBaseOrderAAndB Load (0.1ms)  SELECT "posts".* FROM "posts" ORDER BY posts.a ASC, posts.b ASC
+  PostWithBaseOrderBAndA Load (0.1ms)  SELECT "posts".* FROM "posts" ORDER BY posts.b ASC, posts.a ASC
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+--------------------------------------------------
+ActiveSortOrderTest: test_base_sort_order_and_sort
+--------------------------------------------------
+   (0.1ms)  SELECT COUNT(*) FROM "posts"
+  PostWithBaseOrderA Load (0.0ms)  SELECT "posts".* FROM "posts" ORDER BY posts.a DESC, posts.a ASC
+  PostWithBaseOrderB Load (0.0ms)  SELECT "posts".* FROM "posts" ORDER BY posts.b DESC, posts.b ASC
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+-----------------------------------------
+ActiveSortOrderTest: test_exposes_version
+-----------------------------------------
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+-----------------------------------
+ActiveSortOrderTest: test_sort_only
+-----------------------------------
+   (0.1ms)  SELECT COUNT(*) FROM "posts"
+  PostWithBaseOrderA Load (0.0ms)  SELECT "posts".* FROM "posts" ORDER BY a desc, posts.a ASC
+  PostWithBaseOrderA Load (0.0ms)  SELECT "posts".* FROM "posts" ORDER BY posts.a DESC, posts.a ASC
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+-------------------------------------------------------
+ActiveSortOrderTest: test_base_sort_order_default_value
+-------------------------------------------------------
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+-------------------------------------------------------
+ActiveSortOrderTest: test_override_base_sort_order_only
+-------------------------------------------------------
+   (0.1ms)  SELECT COUNT(*) FROM "posts"
+  PostWithBaseOrderA Load (0.0ms)  SELECT "posts".* FROM "posts" ORDER BY posts.b ASC
+  PostWithBaseOrderA Load (0.0ms)  SELECT "posts".* FROM "posts" ORDER BY "posts"."id" ASC
+  PostWithBaseOrderA Load (0.0ms)  SELECT "posts".* FROM "posts" ORDER BY "posts"."id" ASC
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.0ms)  begin transaction
+---------------------------------------------
+ActiveSortOrderTest: test_exposes_main_module
+---------------------------------------------
+  TRANSACTION (0.0ms)  rollback transaction

data/test/unit/active_sort_order_test.rb

@@ -121,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_sort_order
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Weston Ganger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord