baseapi 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fb67821b5f3db39fea1ef9dd96883c4341cdede
-  data.tar.gz: d7ebdd268fb277a8c6f07ca499874d6088a3e2a3
+  metadata.gz: d9131d7932eed7001aeb99adbd26c658008c2c26
+  data.tar.gz: 5758efa739cb76c7872b67b162d202544c083b2c
 SHA512:
-  metadata.gz: ab5bec3a4805c440a0a52b64c62bb1822333169426703c60526bc901df682d6fc2c6c53d98bfb6a9bcd02b396692618dbf762ab487c7a7f8f1b1634831164421
-  data.tar.gz: 73e08bf142091102411f8dca9a293c24abadb9cbcf39f3ace5b62d7c0d0d46e0f8f98ddaa43f280c2de399205f7439e351e7009f2cf27a73341a628f18dcc95a
+  metadata.gz: 7b2d2a423c600e8d1dffd81206d816fa3916fa148b5367c609b9bbdf81ab6e7f4b45b9d65b72e69e553d928148d94f9abd982dfed164b5f52bf93ad0fb9b5064
+  data.tar.gz: 0ea3ff497b6bb26a6e39c03a2f421c9da822db8e3419c8a65dfa77d5f093cbb00c31d9e9978c5637e8f30b414b7a1673530c20058e0acf12579ebd8015976870

data/README.md

@@ -102,15 +102,15 @@ 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.21~)
+Specify the multiple sorting order (v0.1.22~)
 
     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
+    SQL   =>  SELECT DISTINCT `users`.* FROM `users` ORDER BY `users`.`name` DESC, `users`.`company_id` ASC
 
-Specify the association sorting order (v0.1.21~)
+Specify the association sorting order[^1] (v0.1.22~)
 
     GET   /users.json?order=asc&orderby=company.name
-    SQL   =>  SELECT DISTINCT `users`.* FROM `users` ...JOIN... ORDER BY companies.name ASC
+    SQL   =>  SELECT DISTINCT `users`.* FROM `users` ...JOIN... ORDER BY `companies`.`name` ASC
 
 Specify the name
 
@@ -510,6 +510,11 @@ It will return an error content
 [jbuilder details here](https://github.com/rails/jbuilder)
 
 
+## TODO
+
+[^1]: orderby associated with foreign_key
+*1 : orderby associated with foreign_key
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment. Run `bundle exec baseapi` to use the code located in this directory, ignoring other installed copies of this gem.

data/lib/baseapi/active_record/relation_extension.rb

@@ -79,14 +79,15 @@ module ActiveRecordRelationExtension
           # 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 : ''
+          table_name = joins_tables.count > 0 ? joins_tables.last.pluralize.underscore : self.model.to_s.pluralize.underscore
           # joins_tables exists check
           joins_tables.each do |table|
             next if !ActiveRecord::Base.connection.tables.include?(table.pluralize.underscore)
           end
+          # check
           if table_name.present?
             # table exists check
-            next if table_name.present? and !ActiveRecord::Base.connection.tables.include?(table_name)
+            next !ActiveRecord::Base.connection.tables.include?(table_name)
             # column_name exists check
             next if !table_name.camelize.singularize.constantize.column_names.include?(column_name)
           else
@@ -96,7 +97,7 @@ module ActiveRecordRelationExtension
           # joins
           joins_array!(joins_tables)
           # order
-          order!("#{table_name}#{table_name.present? ? '.' : ''}#{column_name} #{order}")
+          order!("`#{table_name}`.`#{column_name}` #{order}")
         end
       end
     end

data/lib/baseapi/version.rb

@@ -1,3 +1,3 @@
 module Baseapi
-  VERSION = "0.1.21"
+  VERSION = "0.1.22"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baseapi
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - Moriyuki Arakawa