baseapi 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39bf71d43a891a48a723f7449148bd4f2a8524a0
-  data.tar.gz: 315a004a9355d7fd2cd691636e00091196fa57b7
+  metadata.gz: d717b23db853f03f0e050478301cae6de593aa31
+  data.tar.gz: 3a1b5c98aeb1064cb8ff21393bf4c55a975c3b48
 SHA512:
-  metadata.gz: 8fda202545cdae23ae9297438c6def1dadb59fd2514f7ae76db2f89b9ee4a0ca0dd54b3f56585d959cd775a69d5c77c490cc824b45b640232969ce37a7fea505
-  data.tar.gz: ff2ad846616eeef7f296752f33f4a229b75898db0ac5081dfdcb1b71a8272efd17645cdd130d3f397efe8768aef92125f31c704f5ebfec4c4720a5ed9ed73cff
+  metadata.gz: 7823dfc05b717d03b70fc6f494f506dcf42890604e41c3bdc5b36c4cafb358cdca44592dd7ab420a91b5464b620325f8e27be8e28ee3f0a0622e104358943711
+  data.tar.gz: e415c9b3e1bf3923c815a716d900bd5a695ead5e428c9cac5a4ed807ac26c22c058c90c6856b769898aca8838d3e2c58c789b9d6963827da8097548f10dad8a8

data/README.md

@@ -102,6 +102,16 @@ Specify the sorting order
     GET   /users.json?order=desc&orderby=name
     SQL   =>  SELECT DISTINCT `users`.* FROM `users` ORDER BY `users`.`name` DESC
 
+Specify the multiple sorting order (v0.1.19~)
+
+    GET   /users.json?order[]=desc&order[]=asc&orderby[]=name&orderby[]=company_id
+    SQL   =>  SELECT DISTINCT `users`.* FROM `users` ORDER BY name DESC, company_id ASC
+
+Specify the association sorting order (v0.1.19~)
+
+    GET   /users.json?order=asc&orderby=company.name
+    SQL   =>  SELECT DISTINCT `users`.* FROM `users` ...JOIN... ORDER BY companies.name ASC
+
 Specify the name
 
     GET   /users.json?name=hoge

data/lib/baseapi/active_record/relation_extension.rb

@@ -67,7 +67,33 @@ module ActiveRecordRelationExtension
   def sorting!(params)
     prefix = self.model.get_reserved_word_prefix
     if params["#{prefix}order".to_sym].present? and params["#{prefix}orderby".to_sym].present?
-      order!({params["#{prefix}orderby".to_sym] => params["#{prefix}order".to_sym]})
+      # array exchange
+      orderby = params["#{prefix}orderby".to_sym]
+      orderbys = orderby.instance_of?(Array) ? orderby : [orderby]
+      order = params["#{prefix}order".to_sym]
+      orders = order.instance_of?(Array) ? order : [order]
+      # multiple order
+      orderbys.each_with_index do |orderby, index|
+        if orders[index].present? and ['DESC', 'ASC'].include?(orders[index].upcase)
+          order = orders[index].upcase
+          # dot notation  example: company.name
+          joins_tables = orderby.split(".")
+          column_name = joins_tables.pop
+          table_name = joins_tables.count > 0 ? joins_tables.last.pluralize.underscore : ''
+          # joins_tables exists check
+          joins_tables.each do |table|
+            next unless ActiveRecord::Base.connection.tables.include?(table.pluralize.underscore)
+          end
+          # table_name exists check
+          next unless ActiveRecord::Base.connection.tables.include?(table_name)
+          # column_name exists check
+          next unless table_name.camelize.singularize.constantize.column_names.include?(column_name)
+          # joins
+          joins_array!(joins_tables)
+          # order
+          order!("#{table_name}#{table_name.present? ? '.' : ''}#{column_name} #{order}")
+        end
+      end
     end
   end
 

data/lib/baseapi/version.rb

@@ -1,3 +1,3 @@
 module Baseapi
-  VERSION = "0.1.18"
+  VERSION = "0.1.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baseapi
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Moriyuki Arakawa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler