effective_resources 0.4.10 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57a9fea58220e51746d9c8467b84e884a3039049
-  data.tar.gz: 3252c3a12d1dbff7591df1f8cbab3d9ea4961ddf
+  metadata.gz: e5800f90d584446cae530052c580fc7d43e690a7
+  data.tar.gz: e5cb47b3fea2a63222a5bbb6f06ca417372b8b3d
 SHA512:
-  metadata.gz: e869b9eb37fe264c797927817fb67f30abf8415217e572ac2dd628ac6e15105e4f425f807bca12f690d01c908cc61b2fad5fe3f67eb2178a7c61b0e88486d2b4
-  data.tar.gz: cd024f08251b9b0ebcbfa22e7e3671b281bcaa603675c10eea7ca89fc05f90f32eddbae710e68a95277c13da844a2e08384f79b4ad6f936bd029abe1710a4e4a
+  metadata.gz: bdb4b94bc22efb2b723df96467b5d7f03c467fd9e173cbeea8ca64edb2e45eba98bb011f5c69fe92d2e997656b614e9593a36179dcc31e91a6e6e2a7d1168a5a
+  data.tar.gz: e7c659d37e240c593c751fee96270c06aef5983b028efdfb5585857d5cd1ca98c06913a5aeb14ca7354ddc216f8f12ecc361c277dfc152c1655c8384c04505c6

data/app/models/effective/resources/relation.rb

@@ -9,7 +9,7 @@ module Effective
       # name: sort by this column, or this relation
       # sort: when a symbol or boolean, this is the relation's column to sort by
 
-      def order(name, direction = :asc, as: nil, sort: nil, sql_column: nil)
+      def order(name, direction = :asc, as: nil, sort: nil, sql_column: nil, limit: nil, reorder: false)
         raise 'expected relation to be present' unless relation
 
         sql_column ||= sql_column(name)
@@ -17,23 +17,24 @@ module Effective
 
         association = associated(name)
         sql_direction = sql_direction(direction)
+        @relation = relation.reorder(nil) if reorder
 
         case sql_type
         when :belongs_to
           relation
             .order("#{is_null(sql_column)} ASC")
-            .order(order_by_associated_conditions(association, sort: sort, direction: direction))
+            .order(order_by_associated_conditions(association, sort: sort, direction: direction, limit: limit))
         when :belongs_to_polymorphic
           relation
             .order("#{sql_column.sub('_id', '_type')} #{sql_direction}")
             .order("#{sql_column} #{sql_direction}")
         when :has_and_belongs_to_many, :has_many, :has_one
           relation
-            .order(order_by_associated_conditions(association, sort: sort, direction: direction))
+            .order(order_by_associated_conditions(association, sort: sort, direction: direction, limit: limit))
             .order("#{sql_column(klass.primary_key)} #{sql_direction}")
         when :effective_addresses
           relation
-            .order(order_by_associated_conditions(associated(:addresses), sort: sort, direction: direction))
+            .order(order_by_associated_conditions(associated(:addresses), sort: sort, direction: direction, limit: limit))
             .order("#{sql_column(klass.primary_key)} #{sql_direction}")
         when :effective_roles
           relation.order("#{sql_column(:roles_mask)} #{sql_direction}")
@@ -219,13 +220,13 @@ module Effective
         "#{key} IN (#{(keys.uniq.compact.presence || [0]).join(',')})"
       end
 
-      def order_by_associated_conditions(association, sort: nil, direction: :asc)
+      def order_by_associated_conditions(association, sort: nil, direction: :asc, limit: nil)
         resource = Effective::Resource.new(association)
 
         # Order the target model for its matching records / keys
         sort_column = (sort unless sort == true) || resource.sort_column
 
-        relation = resource.relation.reorder(nil).order("#{resource.sql_column(sort_column)} #{sql_direction(direction)}")
+        relation = resource.order(sort_column, direction, limit: limit, reorder: true).limit([limit, 1000].compact.min)
 
         if association.options[:as] # polymorphic
           relation = relation.where(association.type => klass.name)

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.4.10'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.5.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-10 00:00:00.000000000 Z
+date: 2017-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails