enh(): paginate_tag

chamnap · Mar 8, 2016 · 23abfe2 · 23abfe2
1 parent 84616a2
commit 23abfe2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/liquid-rails/tags/paginate_tag.rb b/lib/liquid-rails/tags/paginate_tag.rb
@@ -37,12 +37,12 @@ def render(context)
         @context = context
 
         context.stack do
-          collection = context[@collection_name]
-          raise ::Liquid::ArgumentError.new("Cannot paginate array '#{@collection_name}'. Not found.") if collection.nil?
+          collection = @context[@collection_name].presence || @context.environments[0][@collection_name]
+          raise ::Liquid::ArgumentError.new("Cannot paginate collection '#{@collection_name}'. Not found.") if collection.nil?
 
           if collection.is_a? Array
             paginated_collection = Kaminari.paginate_array(collection.to_a).page(current_page).per(@page_size)
-          elsif collection.respond_to?(:page) && collection.respond_to?(:per)
+          elsif collection.respond_to?(:page)
             paginated_collection = collection.page(current_page).per(@page_size)
           end