baseapi 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9131d7932eed7001aeb99adbd26c658008c2c26
-  data.tar.gz: 5758efa739cb76c7872b67b162d202544c083b2c
+  metadata.gz: 4d6d1eaa16cd3a511f8b38caba27defcfe20c4f0
+  data.tar.gz: af7d9a976a0247faf15987fde6ac17429e32c933
 SHA512:
-  metadata.gz: 7b2d2a423c600e8d1dffd81206d816fa3916fa148b5367c609b9bbdf81ab6e7f4b45b9d65b72e69e553d928148d94f9abd982dfed164b5f52bf93ad0fb9b5064
-  data.tar.gz: 0ea3ff497b6bb26a6e39c03a2f421c9da822db8e3419c8a65dfa77d5f093cbb00c31d9e9978c5637e8f30b414b7a1673530c20058e0acf12579ebd8015976870
+  metadata.gz: dd4cc0e0e3b4b4b166c1e4064b6e8785628480370d4db1733b213f33f6e8b93b8d04cd8568f767d563730c55b0b03df457c8d90a0dc52f42c8fa1dfd92df53f7
+  data.tar.gz: aef9d9ec7f2870b64b6e711257356c82730cb6e8f0cea36dcd37f280ef06daac9c1fbed611c427944b91d580357c0671c72121bbfecf791786a8f0e954e60ed7

data/README.md

@@ -107,7 +107,7 @@ 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 `users`.`name` DESC, `users`.`company_id` ASC
 
-Specify the association sorting order[^1] (v0.1.22~)
+Specify the association sorting order[^1] (v0.1.23~)
 
     GET   /users.json?order=asc&orderby=company.name
     SQL   =>  SELECT DISTINCT `users`.* FROM `users` ...JOIN... ORDER BY `companies`.`name` ASC

data/lib/baseapi/active_record/relation_extension.rb

@@ -84,16 +84,10 @@ module ActiveRecordRelationExtension
           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 !ActiveRecord::Base.connection.tables.include?(table_name)
-            # column_name exists check
-            next if !table_name.camelize.singularize.constantize.column_names.include?(column_name)
-          else
-            # column_name exists check
-            next if !self.model.column_names.include?(column_name)
-          end
+          # table exists check
+          next if !ActiveRecord::Base.connection.tables.include?(table_name)
+          # column_name exists check
+          next if !table_name.camelize.singularize.constantize.column_names.include?(column_name)
           # joins
           joins_array!(joins_tables)
           # order

data/lib/baseapi/version.rb

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

metadata

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