baseapi 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d00d49da9c151fd2e10b73220edce2b812df815
-  data.tar.gz: e8287d9df7f50bdfc048c6a7870c5d6aa0c48a84
+  metadata.gz: 50c8afe497f0ce3be4000d49f56f5a784c84d5cd
+  data.tar.gz: 74a4da68bc84672fce18cf23ba2c6064f19167e6
 SHA512:
-  metadata.gz: 4f85f2c12c2631b7fcb86d6c35283085c2fbfeccdabb2fcb0176414d9b62a4fa9dc14be5a1a6d8bdc7bc890695013150286a9e6ab7af98fafd525cb86eceb956
-  data.tar.gz: ca9dc9d4e5f34ca9b4767f5b0578b9df983eaef5170dbaa4291bf1cc3ee74fcca8252257b1860001af88ade26074e8bb7a74cd2a0643dfaf3a20e0e9cf7bcdb1
+  metadata.gz: 51f33afc48e9e76694f2f969201c8358046e5fb468a40d832b5a9695343c9095502e9e16e52781413d5bbf3ce6c3d90ac43d6b551bddfa371a32f137d7e7ad07
+  data.tar.gz: ca4fd1d21dd61b42cb716f2656b80f81a94a8b34681af89877bd9f924d686dca781f24fe36b63efb5d19c5a673c7bc2595aadfd510ed97550153804e40cf410e

data/lib/baseapi/active_record/relation_extension.rb

@@ -50,6 +50,11 @@ module ActiveRecordRelationExtension
 
   # pager
   # @param  Hash    params
+  # count & page params example:
+  #   count
+  #     GET   /?count=10
+  #   page
+  #     GET   /?count=10&page=2
   def paging!(params)
     prefix = self.model.get_reserved_word_prefix
     count = params["#{prefix}count".to_sym].present? ? params["#{prefix}count".to_sym].to_i : -1;
@@ -66,62 +71,66 @@ module ActiveRecordRelationExtension
 
   # sort
   # @param  Hash    params
+  # order & orderby params example:
+  #   Model
+  #     class Project < ActiveRecord::Base
+  #       belongs_to  :status
+  #       belongs_to  :manager, foreign_key: 'manager_id', class_name: 'User'
+  #       belongs_to  :leader,  foreign_key: 'leader_id',  class_name: 'User'
+  #       has_many    :tasks
+  #     end
+  #   single order
+  #     GET   /?orderby=id&order=desc
+  #   multiple order
+  #     GET   /?orderby[]=name&order[]=asc&orderby[]=id&order[]=desc
+  #   belongs_to association order
+  #     GET   /?orderby=status.id&order=desc
+  #   belongs_to association order (changed the foreign key)
+  #     GET   /?orderby=manager.id&order=desc
+  #   has_many association order
+  #     GET   /?orderby=tasks.id&order=asc
   def sorting!(params)
     prefix = self.model.get_reserved_word_prefix
     if params["#{prefix}order".to_sym].present? and params["#{prefix}orderby".to_sym].present?
-      # 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 : self.model.to_s.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 orders[index].blank?
+        next unless ['DESC', 'ASC'].include?(orders[index].upcase)
+        order = orders[index].upcase
+        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
+        parent_table_name = joins_tables.count > 1 ? joins_tables.last(2).first : self.model.to_s.pluralize.underscore
+        association = parent_table_name.camelize.singularize.constantize.reflect_on_association(table_name.singularize)
+        # belongs_to association order (changed the foreign key)
+        if association and association.options[:class_name].present?
+          association_table_name = association.options[:class_name].pluralize.underscore
+          table_alias = table_name.pluralize.underscore
+          next unless ActiveRecord::Base.connection.tables.include?(association_table_name)
+          parent_model = parent_table_name.camelize.singularize.constantize
+          association_model = association_table_name.camelize.singularize.constantize
+          # joins
+          arel_alias = association_model.arel_table.alias(table_alias)
+          joins_arel = parent_model.arel_table.join(arel_alias).on(arel_alias[:id].eq parent_model.arel_table["#{table_alias.singularize}_id".to_sym])
+          joins_arel.join_sources
+          joins!(joins_arel.join_sources)
+          # order
+          order!(arel_alias[column_name.to_sym].send(order.downcase))
+        # other order
+        else
+          # joins_tables exists check
+          next unless joins_tables.select{|table| ActiveRecord::Base.connection.tables.include?(table.pluralize.underscore) }.count == joins_tables.count
+          # table 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.camelize.singularize.constantize.arel_table[column_name.to_sym].send(order.downcase))
         end
       end
     end

data/lib/baseapi/version.rb

@@ -1,3 +1,3 @@
 module Baseapi
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baseapi
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Moriyuki Arakawa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler