order_as_specified 1.4 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 810fb1d84c1606e6a005b15d822d6758a93caf1ae53b9df6a695ff8d2e024582
-  data.tar.gz: ce7d3be0ef5a951a65bb1e5ceae0aa07ec3e0957fc844a6ecd2d0ca02af9170d
+  metadata.gz: c11fb5ed7165ea2a50cdab0cdb421ac0faa8a187539b0c1f661d6f64fe8107ed
+  data.tar.gz: 975e533ab7a733c8f3f68c7b6363dab96ac1d90a08f4223ba7bcc067443d21a8
 SHA512:
-  metadata.gz: 7e8e491197afaf309031af8d7eb7869d1acdd2884ef776e6440a137a5288601993164ddc31815a42703407d18d51f73c917577cc80dbde2c742f7b6b7e06ab10
-  data.tar.gz: d8437b518f99ae3a9d6f75069e927b1a677772957d6868c9d3a24f49dd956c3a66f62f31174ae5796447a0b6806b1c15294ad94591ddddf415ca0a6c24ba190e
+  metadata.gz: 8b56240f7f9527be2dfb266583ffcccd7aa8992da08139e1824f19c1ea2b82266b5a88bcbbe87db740571d07cd53b4c20bad5d67d4bd4c56d2d3fa0fc132c0cc
+  data.tar.gz: cc12430e2ef88f18225235de1900a0e1662a908da3f2f411cb64fcf9336a82f6fad886ceb99f840c718d140b832002f47aafaebc807844cdcd5cfe51ba1e8a90

data/.travis.yml

@@ -14,9 +14,9 @@ after_script:
   - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 addons:
   postgresql: "9.3"
-  code_climate:
-    repo_token: 781c439d68cbb928316deaec1c7136f98423e1db87238f99cbc95183de94df9e
 env:
+  global:
+    CC_TEST_REPORTER_ID=781c439d68cbb928316deaec1c7136f98423e1db87238f99cbc95183de94df9e
   matrix:
     - AR_VERSION="~> 5.0.0"
     - AR_VERSION="~> 5.1.0"

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.5
+
+This release improves performance by switching to use `CASE` statements. Huge
+thanks to [Yen-Nan (Maso) Lin](https://github.com/masolin) for this improvement!
+
 # 1.4
 
 This release removes deprecation warnings for ActiveRecord 5.2 users, and drops

data/README.md

@@ -26,8 +26,8 @@ TestObject.order_as_specified(language: ["es", "en", "fr"])
 
 Other gems like `ranked-model`, `acts_as_sortable`, etc. assume you want the
 same ordering each time, and store data to keep track of this in the database.
-They're great at what they do, but if your desired ordering changes, or if you
-don't always want an ordering, this gem is your friend.
+They're great at what they do, but if you want to change the ordering, or if
+you don't always want an ordering, this gem is your friend.
 
 ## Installation
 

data/lib/order_as_specified/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OrderAsSpecified
-  VERSION = "1.4"
+  VERSION = "1.5"
 end

data/lib/order_as_specified.rb

@@ -13,6 +13,7 @@ module OrderAsSpecified
   def order_as_specified(hash)
     distinct_on = hash.delete(:distinct_on)
     params = extract_params(hash)
+    return all if params[:values].empty?
 
     table = connection.quote_table_name(params[:table])
     attribute = connection.quote_column_name(params[:attribute])
@@ -28,11 +29,15 @@ module OrderAsSpecified
       "#{table}.#{attribute}=#{db_connection.quote(value)}"
     end
 
-    scope = order(Arel.sql(conditions.map { |cond| "#{cond} DESC" }.join(", ")))
+    when_queries = conditions.map.with_index do |cond, index|
+      "WHEN #{cond} THEN #{index}"
+    end
+    case_query = "CASE #{when_queries.join(' ')} ELSE #{conditions.size} END"
+    scope = order(Arel.sql("#{case_query} ASC"))
 
     if distinct_on
       scope = scope.select(
-        Arel.sql("DISTINCT ON (#{conditions.join(', ')}) #{table}.*")
+        Arel.sql("DISTINCT ON (#{case_query}) #{table}.*")
       )
     end
 

data/spec/postgresql_spec.rb

@@ -62,7 +62,8 @@ RSpec.describe "PostgreSQL" do
           distinct_on: true,
           table => { column => ["foo"] }
         ).to_sql
-        expect(sql).to include("DISTINCT ON (#{quoted_table}.#{quoted_column}")
+        pattern = "DISTINCT ON (CASE WHEN #{quoted_table}.#{quoted_column}"
+        expect(sql).to include(pattern)
       end
     end
   end

data/spec/shared/order_as_specified_examples.rb

@@ -65,6 +65,22 @@ RSpec.shared_examples ".order_as_specified" do
     end
   end
 
+  context "when the order is empty array" do
+    subject { TestClass.order_as_specified(field: []) }
+
+    let(:test_objects) do
+      Array.new(5) do |i|
+        TestClass.create(field: "Field #{i}")
+      end
+    end
+
+    it "keep the original order" do
+      test_objects # Build test objects
+      expect(subject.map(&:id)).
+        to eq test_objects.map(&:id)
+    end
+  end
+
   context "with another table name specified" do
     subject do
       TestClass.
@@ -129,7 +145,8 @@ RSpec.shared_examples ".order_as_specified" do
       quoted_column = AssociationTestClass.connection.quote_column_name(column)
 
       sql = TestClass.order_as_specified(table => { column => ["foo"] }).to_sql
-      expect(sql).to include("ORDER BY #{quoted_table}.#{quoted_column}")
+      pattern = "ORDER BY CASE WHEN #{quoted_table}.#{quoted_column}"
+      expect(sql).to include(pattern)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: order_as_specified
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: '1.5'
 platform: ruby
 authors:
 - Jacob Evelyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2018-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord