hurray 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66fc996dcb6ff5de44ceda87d0b9de9df69bbc40
-  data.tar.gz: 2918a2a990f457a1ac33d36192a0814915a888b3
+  metadata.gz: b793175c03a722e4ccefe615c0ed55eef56016db
+  data.tar.gz: e8512e3b6696f47ed55eaf0bd66cf8c6a7ae290f
 SHA512:
-  metadata.gz: a81f7f152f5c3521cb3e163c1e4b886a8191d4a9b57e4f1af81f3edf3b164d8afa1804c03e3ac1c1bb8b54e0a5eee92f70c69d6792c596111ee6afeeefe37e20
-  data.tar.gz: e37f3aabb3a41d24f49cb674194cd7171070807f2f5d7a87a9631becac96cca5ad7d4370c574a67892620ee5dff8d891f303306dd0970d26f01207ed01681edc
+  metadata.gz: 1dfff74b4ddd096c24baf0aa379f23355463d2c7891dbd1f16ff25f04a2d580fbaf8de59f9980f210e83560cc234fb95f9c863acdfbfd638eb726ec1265036ad
+  data.tar.gz: bbaa37b46f7ce1acb105a2685aae896a571f6fd78647a545bb87069833b87ecd534e7b04c6ab9cc020442dcf1dd9312273e34260ed3eec42c976c56a499ef733

data/lib/hurray.rb

@@ -6,36 +6,45 @@ module Hurray
     # Get records ordered according to the specified with array column order
     #
     # Examples:
-    #   >> User.ordered_with(:id, [4,2,6])
+    #   >> 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 ...>]
+    #   >> User.joins(:friends).ordered_with(friends: { id: [4, 2, 6] })
     #
     # Arguments:
-    #   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])
+    #   hash: (Hash)
+
+    def ordered_with(hash)
+      params = parse_ordered_with_params(hash)
+
+      order_clause = ''
+      params.each_with_index do |param, index|
+        order_clause << ' , ' if index != 0
+        order_clause << "CASE #{param[:table]}.#{param[:column]} "
+        array = param[:array]
+        array.each_with_index do |el, pos|
+          order_clause << sanitize_sql_array(['WHEN ? THEN ? ', el, pos])
+        end
+        order_clause << sanitize_sql_array(['ELSE ? END', array.length])
       end
-      order_clause << sanitize_sql_array(['ELSE ? END ', array.length]) << direction
 
-      return where(column => array).order(order_clause) if provided_only
       order(order_clause)
     end
+
+    private
+
+    def parse_ordered_with_params(table = table_name, hash)
+      results = []
+      hash.each do |k, v|
+        if v.is_a? Hash
+          parse_ordered_with_params(k.to_s, v)
+        else
+          results << { table: table, column: k.to_s, array: v }
+        end
+      end
+      results
+    end
+
   end
 end
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: hurray
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ruslan Kotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
-dependencies: []
+date: 2016-04-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: Simple ActiveRecord extension for working with database arrays fields
 email: rkotov93@gmail.com
 executables: []