find_with_order 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d955f79fc86d2b1d9ddd2e4b0e5576fb2d89d252
-  data.tar.gz: d0eb726b23436e935c67065ec57ba4423fac9657
+  metadata.gz: 3024d02ad143449be88b240808017c7ab38500b3
+  data.tar.gz: d65519466c2eee4e8cd41e3d887d8368c5af9e67
 SHA512:
-  metadata.gz: 8abb85b303feae5550fafad62a2db381c16350829427f4ce46da796e3a15fcc0e28fa2cf25b3b168407ebe81cb98280fab6a584dc91ebe4214ed4bad6cab949a
-  data.tar.gz: 33ad5f2bd2f4957828d02072ca4c4feca2b35c39d8c85021e3820cc8fb9882a540f5ee306d74c392ead5fca7ce954886355af12ebacd2a20d0813d2efde39e04
+  metadata.gz: 26c9c3b58f458a24bd87c90d4caa869aa9c09f28f26dd1409dd22a877b105f2aab24f413dc95d09931bc064aa89e9e97f1074d0839f2569934972187c36aed50
+  data.tar.gz: 9d16130c3d37aa9f69eaabd2e61684392cca820a7708bc75a0d9043a24cca3e382c70211385d8618e5e2acd60cad5e7c56e3b97b4ba7b1e5f7a3147b090eafa2

data/README.md

@@ -35,6 +35,7 @@ User.find([3, 1, 5]).map(&:id)
 User.find_with_order([3, 1, 5]).map(&:id)
 # => [3, 1, 5] 
 ```
+
 ### Support order other columns
 ```rb
 User.where(name: %w(Pearl John Kathenrie)).pluck(:name)
@@ -44,6 +45,16 @@ User.where_with_order(:name, %w(Pearl John Kathenrie)).pluck(:name)
 # => ['Pearl', 'John', 'Kathenrie']
 ```
 
+### Just order part of results
+```rb
+User.where(leader: true).with_order(:name, %w(Pearl John)).pluck(:name)
+# => ['Pearl', 'John', 'Kathenrie']
+
+User.where(leader: true).with_order(:name, %w(Pearl John), null_first: true).pluck(:name)
+# => ['Kathenrie', 'Pearl', 'John']
+```
+
+
 ## Benchmark
 ### Compare with manually sorting in rails
 

data/lib/find_with_order.rb

@@ -3,20 +3,31 @@ require "find_with_order/mysql_support"
 require "find_with_order/pg_support"
 require 'active_record'
 
+module FindWithOrder
+  class << self
+    def supporter
+      return FindWithOrder::PGSupport if defined?(PG)
+      return FindWithOrder::MysqlSupport
+    end
+  end
+end
+
 class << ActiveRecord::Base
   def find_with_order(ids)
     return none if ids.blank?
-    ids = ids.uniq
-    return FindWithOrder::PGSupport.find_with_order(self, ids) if defined?(PG)
-    return FindWithOrder::MysqlSupport.find_with_order(self, ids)
+    return FindWithOrder.supporter.find_with_order(self, ids.uniq)
   end
+
   def where_with_order(column, ids)
     return none if ids.blank?
-    ids = ids.uniq
-    return FindWithOrder::PGSupport.where_with_order(self, column, ids) if defined?(PG)
-    return FindWithOrder::MysqlSupport.where_with_order(self, column, ids)
+    return FindWithOrder.supporter.where_with_order(self, column, ids.uniq)
+  end
+
+  def with_order(column, ids, null_first: false)
+    FindWithOrder.supporter.with_order(self, column, ids, null_first: null_first)
   end
 end
+
 unless ActiveRecord::Base.respond_to?(:none) # extend only if not implement yet
   class ActiveRecord::Base
     def self.none #For Rails 3

data/lib/find_with_order/mysql_support.rb

@@ -1,10 +1,18 @@
-module FindWithOrder
-  module MysqlSupport
-    def self.find_with_order(relation, ids)
-      return relation.where(id: ids).order("field(#{relation.table_name}.id, #{ids.join(',')})").to_a
+module FindWithOrder::MysqlSupport
+  class << self
+    def find_with_order(relation, ids)
+      relation.where(id: ids)
+              .order("field(#{relation.table_name}.id, #{ids.join(',')})")
+              .to_a
     end
-    def self.where_with_order(relation, column, ids)
-      return relation.where(column => ids).order("field(#{column}, #{ids.map(&:inspect).join(',')})")
+
+    def where_with_order(relation, column, ids)
+      with_order(relation.where(column => ids), column, ids, null_first: true)
+    end
+
+    def with_order(relation, column, ids, null_first: false)
+      return relation.order("field(#{column}, #{ids.map(&:inspect).join(',')})") if null_first 
+      return relation.order("field(#{column}, #{ids.reverse.map(&:inspect).join(',')}) DESC")
     end
   end
 end

data/lib/find_with_order/pg_support.rb

@@ -1,26 +1,31 @@
-module FindWithOrder
-  module PGSupport
-    def self.find_with_order(relation, ids)
+module FindWithOrder::PGSupport
+  class << self
+    def find_with_order(relation, ids)
       # return relation.where(id: ids).order("array_position(ARRAY[#{ids.join(',')}], #{relation.table_name}.id)").to_a #array_position is only support in PG >= 9.5
       return relation.where(id: ids)
                      .joins("JOIN (SELECT id.val, row_number() over() FROM (VALUES(#{ids.join('),(')})) AS id(val)) AS id ON (#{relation.table_name}.id = id.val)")
                      .order('row_number')
     end
-    def self.where_with_order(relation, column, ids)
-      relation = relation.where(column => ids)
+
+    def where_with_order(relation, column, ids)
+      with_order(relation.where(column => ids), column, ids)
+    end
+
+    def with_order(relation, column, ids, null_first: false)
+      ids = ids.reverse if null_first
       case ids.first
       when Numeric
+        values = ids.join('),(')
         # return relation.order("array_position(ARRAY[#{ids.join(',')}], #{column})") #array_position is only support in PG >= 9.5
-        return relation.joins("JOIN (SELECT id.val, row_number() over() FROM (VALUES(#{ids.join('),(')})) AS id(val)) AS id ON (#{column} = id.val)")
-                       .order('row_number')
       when String
         ids.map!{|s| ActiveRecord::Base.connection.quote_string(s) }
+        values = "'#{ids.join("'),('")}'"
         # return relation.order("array_position(ARRAY['#{ids.join("','")}']::varchar[], #{column})") #array_position is only support in PG >= 9.5
-        return relation.joins("JOIN (SELECT id.val, row_number() over() FROM (VALUES('#{ids.join("'),('")}')) AS id(val)) AS id ON (#{column} = id.val)")
-                       .order('row_number')
       else
         raise "not support type: #{ids.first.class}"
       end
+      return relation.joins("LEFT JOIN (SELECT id.val, row_number() over() FROM (VALUES(#{values})) AS id(val)) AS id ON (#{column} = id.val)")
+                     .order(null_first ? 'row_number DESC' : 'row_number')
     end
   end
 end

data/lib/find_with_order/version.rb

@@ -1,3 +1,3 @@
 module FindWithOrder
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: find_with_order
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler