hurray 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3e34ce451eb889b4d867756947de4a4d9847dca
-  data.tar.gz: 758b500cf5cf339336a521f0f96e584e3f8e114c
+  metadata.gz: 66fc996dcb6ff5de44ceda87d0b9de9df69bbc40
+  data.tar.gz: 2918a2a990f457a1ac33d36192a0814915a888b3
 SHA512:
-  metadata.gz: b6bf275b489355dc56c92c0f10f827199343f8f55e83a35dc2653e0f0bc114c326c4c8fae1ae013cdc3a078b7079933e1e59c368abdd485d4d65d663d1d90261
-  data.tar.gz: 6b372d8f0b96579ea83bb21a416e81c13051f4ccb8f043bc3c40df31e82c53c454360d9346572ab2278175ee69b321eb428285c27aa2d3e64e56e7c66547ac61
+  metadata.gz: a81f7f152f5c3521cb3e163c1e4b886a8191d4a9b57e4f1af81f3edf3b164d8afa1804c03e3ac1c1bb8b54e0a5eee92f70c69d6792c596111ee6afeeefe37e20
+  data.tar.gz: e37f3aabb3a41d24f49cb674194cd7171070807f2f5d7a87a9631becac96cca5ad7d4370c574a67892620ee5dff8d891f303306dd0970d26f01207ed01681edc

data/lib/hurray.rb

@@ -3,22 +3,38 @@ module Hurray
   extend ActiveSupport::Concern
 
   module ClassMethods
-    # Get records ordered according to the ids order
+    # Get records ordered according to the specified with array column order
     #
-    # Example:
-    #   >> User.ordered_with([4,2,6])
-    #   => User::ActiveRecord_Relation
-    #   => [#<User id: 4 ...>, #<User id: 2 ...>, #<User id: 6 ...>]
+    # Examples:
+    #   >> User.ordered_with(:id, [4,2,6])
+    #   => User::ActiveRecord_Relation [#<User id: 4 ...>, #<User id: 2 ...>, #<User id: 6 ...>, #<User id: 1 ...>, ...]
+    #
+    #   >> User.ordered_with(:id, [4,2,6], provided_only: true)
+    #   => User::ActiveRecord_Relation [#<User id: 4 ...>, #<User id: 2 ...>, #<User id: 6 ...>]
+    #
+    #   >> User.ordered_with(:name, %w(Nick Malvin John), provided_only: true)
+    #   => User::ActiveRecord_Relation [#<User name: Nick ...>, #<User name: Malvin ...>, #<User name: John ...>]
     #
     # Arguments:
-    #   ids: (Array)
-    def ordered_with(ids)
-      order_clause = 'CASE id '
-      ids.each_with_index do |id, index|
-        order_clause << sanitize_sql_array(['WHEN ? THEN ? ', id, index])
+    #   column:  (Key or String) # DB column
+    #   array:   (Array)         # Custom order
+    #   options: (Hash)
+    #     povided:   (Boolean)       # Get records satisfying array values
+    #     direction: (Key or String) # :asc or :desc
+
+    def ordered_with(column, array, options = {})
+      direction = options[:direction].to_s.upcase
+      direction = %w(ASC DESC).include?(direction) ? direction : 'ASC'
+      provided_only = options[:provided_only].nil? ? false : options[:provided_only]
+
+      order_clause = "CASE #{column} "
+      array.each_with_index do |el, index|
+        order_clause << sanitize_sql_array(['WHEN ? THEN ? ', el, index])
       end
-      order_clause << sanitize_sql_array(['ELSE ? END', ids.length])
-      where(id: ids).order(order_clause)
+      order_clause << sanitize_sql_array(['ELSE ? END ', array.length]) << direction
+
+      return where(column => array).order(order_clause) if provided_only
+      order(order_clause)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hurray
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Ruslan Kotov