baseapi 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a559935b8e1eb2c1ac7418e084c0bb9d4a6185b
-  data.tar.gz: 8a4b2598c2a23c09e1a79ebcbad0a2b2c6923d0a
+  metadata.gz: 25e5520506f037fce90f73374e06640c124f2b74
+  data.tar.gz: f95d92c2f4a326c7f1f798a3b88403dbce01af0c
 SHA512:
-  metadata.gz: bca05467579b8dd593c7161ac69558fe8e222275c107aa6c65ddcfb485ce712449732bf8c41a719cebb38ec85e34f02a66b4f5eab0557fffe09507d6063eb9e5
-  data.tar.gz: 752a6a65f0cabc07bb31d3309b97ecae395818d8b065865ca6251680169e39853af3eb480f6f4a3538da9df295db7fadf9628cdb89cecec077aeb0738f4e4c30
+  metadata.gz: 82f792e4c93ddb83b4ae0e67d2da016edff044f1b8cbfbd14cf40acd8dd805f2e11fa98dedaf6b255b3e40c8a26dcdbf3bb4affd2f71d198caf0426f18e55ff0
+  data.tar.gz: 52a922a6cc3fc4c773ef2c0af598edbee4501a1ae089c6e7c4b8d19349acb968ed35cc82660ac1be24b050e9c3c72ab9531ad8730133327f6c5163264dcd336c

data/lib/baseapi/active_record/relation_extension.rb

@@ -80,20 +80,46 @@ module ActiveRecordRelationExtension
           joins_tables = orderby.split(".")
           column_name = joins_tables.pop
           table_name = joins_tables.count > 0 ? joins_tables.last.pluralize.underscore : self.model.to_s.pluralize.underscore
-          # joins_tables exists check
-          is_next = false
-          joins_tables.each do |table|
-            is_next = true and break if !ActiveRecord::Base.connection.tables.include?(table.pluralize.underscore)
+          # table_name parent table
+          parent_table_name = joins_tables.count > 1 ? joins_tables.last(2).first : self.model.to_s.pluralize.underscore
+          # parent_table get association
+          association = parent_table_name.camelize.singularize.constantize.reflect_on_association(table_name.singularize)
+          # If you have specified class_name in belongs_to method (for example, you have changed the foreign key)
+          # example:
+          # class Project < ActiveRecord::Base
+          #   belongs_to :manager, foreign_key: 'manager_id', class_name: 'User'
+          #   belongs_to :leader,  foreign_key: 'leader_id',  class_name: 'User'
+          # end
+          if association and association.options[:class_name].present?
+            association_table_name = association.options[:class_name].pluralize.underscore
+            table_alias = table_name.pluralize.underscore
+            # check
+            next if !ActiveRecord::Base.connection.tables.include?(association_table_name)
+            # join
+            joins!("INNER JOIN `#{association_table_name}` AS `#{table_alias}` ON `#{table_alias}`.`id` = `#{parent_table_name}`.`#{table_alias.singularize}_id`")
+            # order
+            order!("`#{table_alias}`.`#{column_name}` #{order}")
+          # belongs_to along the rails convention
+          # example:
+          # class Project < ActiveRecord::Base
+          #   belongs_to :manager
+          # end
+          else
+            # joins_tables exists check
+            is_next = false
+            joins_tables.each do |table|
+              is_next = true and break if !ActiveRecord::Base.connection.tables.include?(table.pluralize.underscore)
+            end
+            next if is_next
+            # 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
+            order!("`#{table_name}`.`#{column_name}` #{order}")
           end
-          next if is_next
-          # 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
-          order!("`#{table_name}`.`#{column_name}` #{order}")
         end
       end
     end

data/lib/baseapi/version.rb

@@ -1,3 +1,3 @@
 module Baseapi
-  VERSION = "0.1.24"
+  VERSION = "0.1.25"
 end

metadata

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