Merge pull request #2 from yoolk/85679260-template-brave

translation filter: add interpolated string

Author: chamnap

lib/liquid-rails/filters/misc_filter.rb

@@ -25,7 +25,7 @@ def toggle_class_name(class_name, condition)
 
       def default_pagination(paginate)
         html = []
-        html << %(<span class="prev">#{link_to(paginate['previous']['title'], paginate['previous']['url'])}</span>) if paginate['previous']
+        html << %(<span class="prev"><a href="#{paginate['previous']['url']}" rel="prev">#{paginate['previous']['title']}</a></span>) if paginate['previous']
 
         for part in paginate['parts']
           if part['is_link']
@@ -37,7 +37,42 @@ def default_pagination(paginate)
           end
         end
 
-        html << %(<span class="next">#{link_to(paginate['next']['title'], paginate['next']['url'])}</span>) if paginate['next']
+        html << %(<span class="next"><a href="#{paginate['next']['url']}" rel="next">#{paginate['next']['title']}</a></span>) if paginate['next']
+        html.join(' ')
+      end
+
+      # Bootstrap pagination filter
+      #
+      # @param [ paginate ]
+      # @param [ size ]: .pagination-lg, .pagination-sm
+
+      def bootstrap_pagination(paginate, size='')
+        html = []
+        html << %{<nav><ul class="pagination #{size}">}
+
+        if paginate['previous']
+          html << %(<li><a href="#{paginate['previous']['url']}" aria-label="Previous"><span aria-hidden="true">#{paginate['previous']['title']}</span></a></li>)
+        else
+          html << %(<li class="disabled"><a href="#" aria-label="Previous"><span aria-hidden="true">&laquo; Previous</span></a></li>)
+        end
+
+        for part in paginate['parts']
+          if part['is_link']
+            html << %(<li><a href="#{part['url']}">#{part['title']}</a></li>)
+          elsif part['title'].to_i == paginate['current_page'].to_i
+            html << %(<li class="active"><a href="#">#{part['title']}</a></li>)
+          else
+            html << %(<li><a href="#">#{part['title']}</a></li>)
+          end
+        end
+
+        if paginate['next']
+          html << %(<li><a href="#{paginate['next']['url']}" aria-label="Next"><span aria-hidden="true">#{paginate['next']['title']}</span></a></li>)
+        else
+          html << %(<li class="disabled"><a href="#" aria-label="Next"><span aria-hidden="true">Next &raquo;</span></a></li>)
+        end
+
+        html << '</nav></ul>'
         html.join(' ')
       end
     end

lib/liquid-rails/filters/text_filter.rb

@@ -2,7 +2,6 @@ module Liquid
   module Rails
     module TextFilter
       delegate \
-                :truncate,
                 :highlight,
                 :excerpt,
                 :pluralize,

lib/liquid-rails/tags/paginate_tag.rb

@@ -50,11 +50,12 @@ def render(context)
           pagination = {}
           pagination['collection']      = paginated_collection
           pagination['current_offset']  = (current_page-1) * @page_size
+          pagination['current_page']    = current_page
           pagination['page_size']       = @page_size
           pagination['pages']           = page_count
           pagination['items']           = paginated_collection.total_count
           pagination['previous']        = link('« Previous'.html_safe, current_page-1 ) unless 1 >= current_page
-          pagination['next']            = link('Next &raquo;'.html_safe, current_page+1 )     unless page_count <= current_page+1
+          pagination['next']            = link('Next &raquo;'.html_safe, current_page+1 )     unless page_count < current_page+1
           pagination['parts']           = []
 
           hellip_break = false

spec/lib/liquid-rails/tags/paginate_tag_spec.rb

@@ -27,6 +27,10 @@ module Rails
           expect_template_result("{% paginate post.comments by 2 %}{{ paginate.current_offset }}{% endpaginate %}", '0', { 'post' => @post_drop })
         end
 
+        it '#current_page' do
+          expect_template_result("{% paginate post.comments by 2 %}{{ paginate.current_page }}{% endpaginate %}", '1', { 'post' => @post_drop })
+        end
+
         it '#page_size' do
           expect_template_result("{% paginate post.comments by 2 %}{{ paginate.page_size }}{% endpaginate %}", '2', { 'post' => @post_drop })
         end
@@ -52,8 +56,26 @@ module Rails
         end
       end
 
+      context 'second_page' do
+        before(:all) { controller.params[:page] = 2 }
+        after(:all)  { controller.params[:page] = nil }
+
+        it '#current_page' do
+          expect_template_result("{% paginate post.comments by 2 %}{{ paginate.current_page }}{% endpaginate %}", '2', { 'post' => @post_drop })
+        end
+
+        it '#previous' do
+          expect_template_result("{% paginate post.comments by 2 %}{{ paginate.previous }}{% endpaginate %}", %|{"title"=>"« Previous", "url"=>"/?page=1", "is_link"=>true}|, { 'post' => @post_drop })
+        end
+
+        it '#next' do
+          expect_template_result("{% paginate post.comments by 2 %}{{ paginate.next }}{% endpaginate %}", %|{"title"=>"Next »", "url"=>"/?page=3", "is_link"=>true}|, { 'post' => @post_drop })
+        end
+      end
+
       context 'last_page' do
         before(:all) { controller.params[:page] = 3 }
+        after(:all)  { controller.params[:page] = nil }
 
         it 'returns the page size' do
           expect_template_result("{% paginate post.comments by 2 %}{{ paginate.collection | size }}{% endpaginate %}", '1', { 'post' => @post_drop })
@@ -67,6 +89,10 @@ module Rails
           expect_template_result("{% paginate post.comments by 2 %}{{ paginate.current_offset }}{% endpaginate %}", '4', { 'post' => @post_drop })
         end
 
+        it '#current_page' do
+          expect_template_result("{% paginate post.comments by 2 %}{{ paginate.current_page }}{% endpaginate %}", '3', { 'post' => @post_drop })
+        end
+
         it '#page_size' do
           expect_template_result("{% paginate post.comments by 2 %}{{ paginate.page_size }}{% endpaginate %}", '2', { 'post' => @post_drop })
         end
@@ -91,6 +117,44 @@ module Rails
           expect_template_result("{% paginate post.comments by 2 %}{{ paginate.parts }}{% endpaginate %}", %|{"title"=>1, "url"=>"/?page=1", "is_link"=>true}{"title"=>2, "url"=>"/?page=2", "is_link"=>true}{"title"=>3, "is_link"=>false, "hellip_break"=>false}|, { 'post' => @post_drop })
         end
       end
+
+      context 'default_pagination' do
+        after(:all)  { controller.params[:page] = nil }
+
+        it 'is in the first_page' do
+          controller.params[:page] = 1
+          expect_template_result("{% paginate post.comments by 2 %}{{ paginate | default_pagination }}{% endpaginate %}", %|<span class=\"page current\">1</span> <span class=\"page\"><a href=\"/?page=2\">2</a></span> <span class=\"page\"><a href=\"/?page=3\">3</a></span> <span class=\"next\"><a href=\"/?page=2\" rel=\"next\">Next &raquo;</a></span>|, { 'post' => @post_drop })
+        end
+
+        it 'is in the second_page' do
+          controller.params[:page] = 2
+          expect_template_result("{% paginate post.comments by 2 %}{{ paginate | default_pagination }}{% endpaginate %}", %|<span class=\"prev\"><a href=\"/?page=1\" rel=\"prev\">&laquo; Previous</a></span> <span class=\"page\"><a href=\"/?page=1\">1</a></span> <span class=\"page current\">2</span> <span class=\"page\"><a href=\"/?page=3\">3</a></span> <span class=\"next\"><a href=\"/?page=3\" rel=\"next\">Next &raquo;</a></span>|, { 'post' => @post_drop })
+        end
+
+        it 'is in the last_page' do
+          controller.params[:page] = 3
+          expect_template_result("{% paginate post.comments by 2 %}{{ paginate | default_pagination }}{% endpaginate %}", %|<span class=\"prev\"><a href=\"/?page=2\" rel=\"prev\">&laquo; Previous</a></span> <span class=\"page\"><a href=\"/?page=1\">1</a></span> <span class=\"page\"><a href=\"/?page=2\">2</a></span> <span class=\"page current\">3</span>|, { 'post' => @post_drop })
+        end
+      end
+
+      context 'bootstrap_pagination' do
+        after(:all)  { controller.params[:page] = nil }
+
+        it 'is in the first_page' do
+          controller.params[:page] = 1
+          expect_template_result("{% paginate post.comments by 2 %}{{ paginate | bootstrap_pagination }}{% endpaginate %}", %|<nav><ul class="pagination "> <li class="disabled"><a href="#" aria-label="Previous"><span aria-hidden="true">&laquo; Previous</span></a></li> <li class="active"><a href="#">1</a></li> <li><a href="/?page=2">2</a></li> <li><a href="/?page=3">3</a></li> <li><a href="/?page=2" aria-label="Next"><span aria-hidden="true">Next &raquo;</span></a></li> </nav></ul>|, { 'post' => @post_drop })
+        end
+
+        it 'is in the second_page' do
+          controller.params[:page] = 2
+          expect_template_result("{% paginate post.comments by 2 %}{{ paginate | bootstrap_pagination }}{% endpaginate %}", %|<nav><ul class="pagination "> <li><a href="/?page=1" aria-label="Previous"><span aria-hidden="true">&laquo; Previous</span></a></li> <li><a href="/?page=1">1</a></li> <li class="active"><a href="#">2</a></li> <li><a href="/?page=3">3</a></li> <li><a href="/?page=3" aria-label="Next"><span aria-hidden="true">Next &raquo;</span></a></li> </nav></ul>|, { 'post' => @post_drop })
+        end
+
+        it 'is in the last_page' do
+          controller.params[:page] = 3
+          expect_template_result("{% paginate post.comments by 2 %}{{ paginate | bootstrap_pagination }}{% endpaginate %}", %|<nav><ul class="pagination "> <li><a href="/?page=2" aria-label="Previous"><span aria-hidden="true">&laquo; Previous</span></a></li> <li><a href="/?page=1">1</a></li> <li><a href="/?page=2">2</a></li> <li class="active"><a href="#">3</a></li> <li class="disabled"><a href="#" aria-label="Next"><span aria-hidden="true">Next &raquo;</span></a></li> </nav></ul>|, { 'post' => @post_drop })
+        end
+      end
     end
   end
 end