liquid-rails 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e9723ef54a8b5602a0eece9ecbf5a3eef85e53f
-  data.tar.gz: 660456e3598bacf1b5f435bea0b7875d46bd7a54
+  metadata.gz: 60effe936f0e73722ccb5017936e8ebd3194225a
+  data.tar.gz: 5184c687fab2ae2966cce49ca46d78576936889e
 SHA512:
-  metadata.gz: ff1a8eca8c43f25d3829951b86b55d747abb5d343224568919f7c25be686ca5a11c469de95111c78caede8327c708cb494fdb81af02b10a94cd671e02603bc5b
-  data.tar.gz: a596f42ec4296f3863f81dab54123ca1f47fbb6fe2d4c6e81ba401470f7cfd509b3737cebf9ca92c9a6d5be99def38238a4483603a785fd4311387447cf69286
+  metadata.gz: cc4fbd79de3c6d0f6529bc597184553dfb2abdce2a195f48d641f1179ab52c5a7ad8401cb71b2131306409252173e6a573beb4a4bd64f95b90c78e60b0a872a3
+  data.tar.gz: bba6ac533ec927f2619948a5761e7ed3230080133f551774371b0e7aaa9b67d564946831452a0f7b73a70d9bd6280142bf9a2b92212e55061f8db40f5c3ebc4b

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.3
+ruby-2.2.0

data/.travis.yml

@@ -2,16 +2,21 @@ language: ruby
 script: "bundle exec rake spec"
 rvm:
   - 2.0.0
-  - 2.1.0
-  - 2.1.1
-  - 2.1.2
+  - 2.1.5
+  - 2.2.0
 env:
   - CODECLIMATE_REPO_TOKEN=891d362268d07d6ff0f5534f92252b6195f6be8795054d3627643eb6314a8c9e
 gemfile:
+  - gemfiles/rails_32.gemfile
   - gemfiles/rails_40.gemfile
   - gemfiles/rails_41.gemfile
+  - gemfiles/rails_42.gemfile
 notifications:
   email: false
+matrix:
+  exclude:
+    - rvm: 2.2.0
+      gemfile: gemfiles/rails_32.gemfile
 addons:
   code_climate:
     repo_token: 891d362268d07d6ff0f5534f92252b6195f6be8795054d3627643eb6314a8c9e

data/CHANGELOG.md

@@ -0,0 +1,28 @@
+# Overview
+
+## 0.1.1 - Not released
+
+### New Features
+
+* Add `bootstrap_pagination` filter. (Radin Reth)
+
+* Allow `translate` filter with interpolation. (Tomasz Stachewicz, Chamnap Chhorn)
+
+* Support `rails` 4.2 and `ruby` 2.2. (Chamnap Chhorn)
+
+* Support `scope` on collection drop. (Radin Reth)
+
+
+### Resolved Issues
+
+* Add `rel="prev"` and `rel="next"` to `default_pagination` filter. (Radin Reth)
+
+* Fix `content_for` and `yield` tag on `rails` 3.2. (Chamnap Chhorn)
+
+* \#4 Makes partial template work in namespaced controller. (Tomasz Stachewicz)
+
+* `truncate` filter now forwards to the standard filters. (Radin Reth)
+
+## 0.1.0
+
+* Initial Release

data/Gemfile

@@ -3,10 +3,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in liquid-rails.gemspec
 gemspec
 
-gem 'rails',       '~> 4.0.10'
-gem 'rspec-rails', '~> 2.14.2'
+gem 'rails',       '~> 4.0.13'
+gem 'rspec-rails', '~> 3.2.0'
+gem 'guard-rspec', '~> 4.5.0'
 gem 'capybara',    '~> 2.4.1'
 gem 'pry-rails'
 gem 'coveralls'
-gem 'simplecov'
-gem 'guard-rspec'
+gem 'simplecov'

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/yoolk/liquid-rails.svg?branch=master)](https://travis-ci.org/yoolk/liquid-rails)[![Coverage Status](https://coveralls.io/repos/yoolk/liquid-rails/badge.png?branch=master)](https://coveralls.io/r/yoolk/liquid-rails?branch=master)
+[![Build Status](https://travis-ci.org/yoolk/liquid-rails.svg?branch=master)](https://travis-ci.org/yoolk/liquid-rails)[![Coverage Status](https://coveralls.io/repos/yoolk/liquid-rails/badge.png?branch=master)](https://coveralls.io/r/yoolk/liquid-rails?branch=master)[![Gem Version](https://badge.fury.io/rb/liquid-rails.svg)](http://badge.fury.io/rb/liquid-rails)
 # Liquid-Rails
 
 It allows you to render `.liquid` templates with layout and partial support. It also provides filters, tags, drops class to be used inside your liquid template.
@@ -135,6 +135,10 @@ describe CommentDrop do
 end
 ```
 
+## Contributors
+
+* [Radin Reth](https://github.com/radin-reth/)
+
 ## Authors
 
-* [Chamnap Chhorn](https://github.com/chamnap)
+* [Chamnap Chhorn](https://github.com/chamnap)

data/Rakefile

@@ -9,7 +9,7 @@ end
 task default: 'spec:all'
 
 namespace :spec do
-  %w(rails_41 rails_40 rails_32).each do |gemfile|
+  %w(rails_42 rails_41 rails_40 rails_32).each do |gemfile|
     desc "Run Tests against #{gemfile}"
     task gemfile do
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
@@ -19,7 +19,7 @@ namespace :spec do
 
   desc "Run Tests against rails versions"
   task :all do
-    %w(rails_41 rails_40 rails_32).each do |gemfile|
+    %w(rails_42 rails_41 rails_40 rails_32).each do |gemfile|
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake spec"
     end

data/gemfiles/rails_32.gemfile

@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'rails',       '~> 3.2.19'
-gem 'rspec-rails', '~> 2.14.2'
+gem 'rails',       '~> 3.2.21'
+gem 'rspec-rails', '~> 3.2.0'
+gem 'guard-rspec', '~> 4.5.0'
 gem 'capybara',    '~> 2.4.1'
 gem 'pry-rails'
 gem 'coveralls'
 gem 'simplecov'
-gem 'guard-rspec'
 
 gemspec path: '../'

data/gemfiles/rails_40.gemfile

@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'rails',       '~> 4.0.10'
-gem 'rspec-rails', '~> 2.14.2'
+gem 'rails',       '~> 4.0.13'
+gem 'rspec-rails', '~> 3.2.0'
+gem 'guard-rspec', '~> 4.5.0'
 gem 'capybara',    '~> 2.4.1'
 gem 'pry-rails'
 gem 'coveralls'
 gem 'simplecov'
-gem 'guard-rspec'
 
 gemspec path: '../'

data/gemfiles/rails_41.gemfile

@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'rails',       '~> 4.1.6'
-gem 'rspec-rails', '~> 2.14.2'
+gem 'rails',       '~> 4.1.9'
+gem 'rspec-rails', '~> 3.2.0'
+gem 'guard-rspec', '~> 4.5.0'
 gem 'capybara',    '~> 2.4.1'
 gem 'pry-rails'
 gem 'coveralls'
 gem 'simplecov'
-gem 'guard-rspec'
 
 gemspec path: '../'

data/gemfiles/rails_42.gemfile

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+gem 'rails',       '~> 4.2.0'
+gem 'rspec-rails', '~> 3.2.0'
+gem 'guard-rspec', '~> 4.5.0'
+gem 'capybara',    '~> 2.4.1'
+gem 'pry-rails'
+gem 'coveralls'
+gem 'simplecov'
+
+gemspec path: '../'

data/lib/liquid-rails/drops/collection_drop.rb

@@ -29,9 +29,9 @@ module Liquid
       delegate :total_count, :total_pages, to: :objects
 
       def initialize(objects, options={})
-        options.assert_valid_keys(:with)
+        options.assert_valid_keys(:with, :scope)
 
-        @objects         = objects
+        @objects         = options[:scope].nil? ? objects : objects.send(options[:scope])
         @drop_class_name = options[:with]
       end
 

data/lib/liquid-rails/file_system.rb

@@ -4,11 +4,10 @@ module Liquid
   module Rails
     class FileSystem < ::Liquid::LocalFileSystem
       def read_template_file(template_path, context)
-        controller_name = context.registers[:controller].controller_name
-        template_path   = "#{controller_name}/#{template_path}" unless template_path.include?('/')
-
+        controller_path = context.registers[:controller].controller_path
+        template_path   = "#{controller_path}/#{template_path}" unless template_path.include?('/')
         super
       end
     end
   end
-end
+end

data/lib/liquid-rails/filters/misc_filter.rb

@@ -22,24 +22,6 @@ module Liquid
       def toggle_class_name(class_name, condition)
         condition ? class_name : nil
       end
-
-      def default_pagination(paginate)
-        html = []
-        html << %(<span class="prev">#{link_to(paginate['previous']['title'], paginate['previous']['url'])}</span>) if paginate['previous']
-
-        for part in paginate['parts']
-          if part['is_link']
-            html << %(<span class="page">#{link_to(part['title'], part['url'])}</span>)
-          elsif part['title'].to_i == paginate['current_page'].to_i
-            html << %(<span class="page current">#{part['title']}</span>)
-          else
-            html << %(<span class="deco">#{part['title']}</span>)
-          end
-        end
-
-        html << %(<span class="next">#{link_to(paginate['next']['title'], paginate['next']['url'])}</span>) if paginate['next']
-        html.join(' ')
-      end
     end
   end
 end

data/lib/liquid-rails/filters/paginate_filter.rb

@@ -0,0 +1,59 @@
+module Liquid
+  module Rails
+    module PaginateFilter
+      def default_pagination(paginate)
+        html = []
+        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']
+            html << %(<span class="page">#{link_to(part['title'], part['url'])}</span>)
+          elsif part['title'].to_i == paginate['current_page'].to_i
+            html << %(<span class="page current">#{part['title']}</span>)
+          else
+            html << %(<span class="deco">#{part['title']}</span>)
+          end
+        end
+
+        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"><span>#{part['title']}</span></li>)
+          else
+            html << %(<li class="disabled"><span>#{part['title']}</span></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
+  end
+end
+
+Liquid::Template.register_filter(Liquid::Rails::PaginateFilter)

data/lib/liquid-rails/filters/text_filter.rb

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

data/lib/liquid-rails/filters/translate_filter.rb

@@ -1,11 +1,12 @@
 module Liquid
   module Rails
     module TranslateFilter
-      def translate(key, locale = nil, scope = nil)
-        locale ||= ::I18n.locale.to_s
+      def translate(key, options={})
+        options = { 'locale' => ::I18n.locale.to_s }.merge(options)
 
-        @context.registers[:view].translate(key.to_s, locale: locale, scope: scope)
+        @context.registers[:view].translate(key.to_s, options.with_indifferent_access)
       end
+      alias_method :t, :translate
     end
   end
 end

data/lib/liquid-rails/rspec/view_controller_context.rb

@@ -7,7 +7,7 @@ module Liquid
         def setup_view_and_controller
           @view                 = ActionView::Base.new
           @controller           = ApplicationController.new
-          @request              = ActionController::TestRequest.new
+          @request              = ActionController::TestRequest.new('PATH_INFO' => '/')
           @response             = ActionController::TestResponse.new
           @response.request     = @request
           @controller.request   = @request
@@ -15,6 +15,7 @@ module Liquid
           @controller.params    = {}
           @view.assign_controller(@controller)
           @view.class.send(:include, @controller._helpers)
+          @view.class.send(:include, ::Rails.application.routes.url_helpers)
         end
 
         def view
@@ -36,7 +37,7 @@ module Liquid
           end
 
           actual = Liquid::Template.parse(template).render!(context)
-          expect(actual).to eq(expected)
+          expect(actual.strip).to eq(expected.strip)
         end
       end
     end

data/lib/liquid-rails/tags/content_for_tag.rb

@@ -22,8 +22,8 @@ module Liquid
         super
 
         if markup =~ Syntax
-          @identifier = $1.to_s
           @flush = $3
+          @identifier = $1.gsub('\'', '')
         else
           raise SyntaxError.new("Syntax Error - Valid syntax: {% content_for [name] %}")
         end
@@ -31,9 +31,18 @@ module Liquid
 
       def render(context)
         @context = context
+        content  = super.html_safe
 
-        options = @flush == 'true' ? { flush: true } : {}
-        @context.registers[:view].content_for(@identifier, super.html_safe, options)
+        if ::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR == 2
+          if @flush == 'true'
+            @context.registers[:view].view_flow.set(@identifier, content) if content
+          else
+            @context.registers[:view].view_flow.append(@identifier, content) if content
+          end
+        else
+          options = @flush == 'true' ? { flush: true } : {}
+          @context.registers[:view].content_for(@identifier, content, options)
+        end
         ''
       end
     end
@@ -49,7 +58,7 @@ module Liquid
         super
 
         if markup =~ Syntax
-          @identifier = $1
+          @identifier = $1.gsub('\'', '')
         else
           raise SyntaxError.new("Syntax Error - Valid syntax: {% yield [name] %}")
         end

data/lib/liquid-rails/tags/paginate_tag.rb

@@ -50,11 +50,12 @@ module Liquid
           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

data/lib/liquid-rails/version.rb

@@ -1,5 +1,5 @@
 module Liquid
   module Rails
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/liquid-rails.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'rails',    '>= 3.2'
-  spec.add_dependency 'liquid',   '~> 3.0.0.rc1'
+  spec.add_dependency 'liquid',   '>= 3.0.0'
   spec.add_dependency 'kaminari', '~> 0.16.1'
 end

data/spec/dummy/app/controllers/foospace/bar_controller.rb

@@ -0,0 +1,5 @@
+class Foospace::BarController < ApplicationController
+  def index_partial
+    render layout: false
+  end
+end

data/spec/dummy/app/views/foospace/bar/_partial.liquid

@@ -0,0 +1 @@
+Bar Partial

data/spec/dummy/app/views/foospace/bar/index_partial.liquid

@@ -0,0 +1,3 @@
+Foospace::BarController
+
+{% include 'partial' %}

data/spec/dummy/config/locales/en.yml

@@ -1,4 +1,5 @@
 en:
   welcome: 'Welcome everyone!'
+  welcome_name: 'Welcome, %{name}'
   links:
     home: 'Home'

data/spec/dummy/config/locales/km.yml

@@ -1,4 +1,5 @@
 km:
   welcome: 'សូមស្វាគមន៍'
+  welcome_name: 'សូមស្វាគមន៍ %{name}'
   links:
     home: 'ទំព័រដើម'

data/spec/dummy/config/routes.rb

@@ -7,4 +7,6 @@ Rails.application.routes.draw do
 
   get  '/index_partial',                to: 'home#index_partial'
   get  '/index_partial_with_full_path', to: 'home#index_partial_with_full_path'
-end
+
+  get '/foospace/bar/index_partial',    to: 'foospace/bar#index_partial'
+end

data/spec/lib/liquid-rails/filters/translate_filter_spec.rb

@@ -14,11 +14,15 @@ module Liquid
       end
 
       it 'translate with specified locale' do
-        expect(::Liquid::Variable.new("'welcome' | translate: 'km'").render(context)).to eq('សូមស្វាគមន៍')
+        expect(::Liquid::Variable.new("'welcome' | translate: locale: 'km'").render(context)).to eq('សូមស្វាគមន៍')
       end
 
       it 'translate with scope' do
-        expect(::Liquid::Variable.new("'home' | translate: 'km', 'links'").render(context)).to eq('ទំព័រដើម')
+        expect(::Liquid::Variable.new("'home' | translate: locale: 'km', scope: 'links'").render(context)).to eq('ទំព័រដើម')
+      end
+
+      it 'translate with interpolation' do
+        expect(::Liquid::Variable.new("'welcome_name' | translate: locale: 'en', name: 'Jeremy'").render(context)).to eq('Welcome, Jeremy')
       end
     end
   end

data/spec/lib/liquid-rails/tags/content_for_tag_spec.rb

@@ -3,7 +3,13 @@ require 'spec_helper'
 module Liquid
   module Rails
     describe ContentForTag, type: :tag do
-      it 'content_for and yield' do
+      it 'content_for and yield with non-quoted key' do
+        Liquid::Template.parse(%|{% content_for not_authorized0 %}alert('You are not authorized to do that!');{% endcontent_for %}|).render(context)
+
+        expect_template_result(%|{% yield not_authorized0 %}|, "alert('You are not authorized to do that!');")
+      end
+
+      it 'content_for and yield with quoted key' do
         Liquid::Template.parse(%|{% content_for 'not_authorized1' %}alert('You are not authorized to do that!');{% endcontent_for %}|).render(context)
 
         expect_template_result(%|{% yield 'not_authorized1' %}|, "alert('You are not authorized to do that!');")

data/spec/lib/liquid-rails/tags/csrf_meta_tag_spec.rb

@@ -6,10 +6,19 @@ module Liquid
       let(:context) { ::Liquid::Context.new({}, {}, { view: view }) }
 
       it '#crsf_meta_tags' do
-        view.stub(:protect_against_forgery?).and_return(true)
+        allow(view).to receive(:protect_against_forgery?).and_return(true)
+        allow(view).to receive(:form_authenticity_token).and_return('rails_form_authenticity_token')
 
         result = Liquid::Template.parse('{% csrf_meta_tags %}').render(context)
-        expect(result).to eq(%|<meta content=\"authenticity_token\" name=\"csrf-param\" />\n<meta content=\"#{view.form_authenticity_token}\" name=\"csrf-token\" />|)
+        metas  = result.split("\n").map { |item| Nokogiri::XML(item).children.first }
+        expect(metas.length).to eq(2)
+        expect(metas[0].name).to eq('meta')
+        expect(metas[0]['name']).to eq('csrf-param')
+        expect(metas[0]['content']).to eq('authenticity_token')
+
+        expect(metas[1].name).to eq('meta')
+        expect(metas[1]['name']).to eq('csrf-token')
+        expect(metas[1]['content']).to eq('rails_form_authenticity_token')
       end
     end
   end

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

@@ -27,6 +27,10 @@ module Liquid
           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
@@ -44,16 +48,34 @@ module Liquid
         end
 
         it '#next' do
-          expect_template_result("{% paginate post.comments by 2 %}{{ paginate.next }}{% endpaginate %}", %|{"title"=>"Next »", "url"=>"?page=2", "is_link"=>true}|, { 'post' => @post_drop })
+          expect_template_result("{% paginate post.comments by 2 %}{{ paginate.next }}{% endpaginate %}", %|{"title"=>"Next »", "url"=>"/?page=2", "is_link"=>true}|, { 'post' => @post_drop })
         end
 
         it '#parts' do
-          expect_template_result("{% paginate post.comments by 2 %}{{ paginate.parts }}{% endpaginate %}", %|{"title"=>1, "is_link"=>false, "hellip_break"=>false}{"title"=>2, "url"=>"?page=2", "is_link"=>true}{"title"=>3, "url"=>"?page=3", "is_link"=>true}|, { 'post' => @post_drop })
+          expect_template_result("{% paginate post.comments by 2 %}{{ paginate.parts }}{% endpaginate %}", %|{"title"=>1, "is_link"=>false, "hellip_break"=>false}{"title"=>2, "url"=>"/?page=2", "is_link"=>true}{"title"=>3, "url"=>"/?page=3", "is_link"=>true}|, { 'post' => @post_drop })
+        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 Liquid
           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
@@ -80,7 +106,7 @@ module Liquid
         end
 
         it '#previous' do
-          expect_template_result("{% paginate post.comments by 2 %}{{ paginate.previous }}{% endpaginate %}", %|{"title"=>"« Previous", "url"=>"?page=2", "is_link"=>true}|, { 'post' => @post_drop })
+          expect_template_result("{% paginate post.comments by 2 %}{{ paginate.previous }}{% endpaginate %}", %|{"title"=>"« Previous", "url"=>"/?page=2", "is_link"=>true}|, { 'post' => @post_drop })
         end
 
         it '#next' do
@@ -88,7 +114,45 @@ module Liquid
         end
 
         it '#parts' do
-          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 })
+          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"><span>1</span></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"><span>2</span></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"><span>3</span></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

data/spec/lib/liquid-rails/template_handler_spec.rb

@@ -35,6 +35,12 @@ describe 'Request', type: :feature do
 
       expect(page.body).to eq "Application Layout\nLiquid on Rails\n\nHome Partial\nShared Partial"
     end
+
+    it 'respects namespace of original template for partials path' do
+      visit '/foospace/bar/index_partial'
+      expect(page.body.strip).to eq("Foospace::BarController\n\nBar Partial")
+    end
+
   end
 
   context 'render with filter' do
@@ -50,4 +56,4 @@ describe 'Request', type: :feature do
       expect(page.body).to eq("Application Layout\nLiquid on Rails\nThis is a long section of text")
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -22,7 +22,6 @@ require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 require 'pry'
 require 'liquid-rails'
 require 'rspec/rails'
-require 'rspec/autorun'
 require 'capybara/rspec'
 require 'liquid-rails/matchers'
 
@@ -35,7 +34,6 @@ require 'fixtures/poro'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.filter_run focus: true
   config.run_all_when_everything_filtered = true
   config.include Capybara::RSpecMatchers

data/spec/support/delegate_matcher.rb

@@ -1,6 +1,6 @@
 # RSpec matcher to spec delegations.
-# Forked from https://gist.github.com/ssimeonov/5942729 with fixes
-# for arity + custom prefix.
+# Gist Version https://gist.github.com/joeytheman/0fe021821e4c62f552ce
+#
 #
 # Usage:
 #
@@ -30,7 +30,7 @@ RSpec::Matchers.define :delegate do |method|
       unless [0,-1].include?(@delegator.method(@to).arity)
         raise "#{@delegator}'s' #{@to} method does not have zero or -1 arity (it expects parameters)"
       end
-      @delegator.stub(@to).and_return receiver_double(method)
+      allow(@delegator).to receive(@to).and_return(receiver_double(method))
       @delegator.send(@method) == :called
     else
       raise "#{@delegator} does not respond to #{@to}"
@@ -41,20 +41,20 @@ RSpec::Matchers.define :delegate do |method|
     "delegate :#{@method} to its #{@to}#{@prefix ? ' with prefix' : ''}"
   end
 
-  failure_message_for_should do |text|
+  failure_message do |text|
     "expected #{@delegator} to delegate :#{@method} to its #{@to}#{@prefix ? ' with prefix' : ''}"
   end
 
-  failure_message_for_should_not do |text|
+  failure_message_when_negated do |text|
     "expected #{@delegator} not to delegate :#{@method} to its #{@to}#{@prefix ? ' with prefix' : ''}"
   end
 
   chain(:to) { |receiver| @to = receiver }
-  chain(:with_prefix) { |prefix| @prefix = prefix || @to }
+  chain(:with_prefix) { |*prefix| @prefix = prefix.first || @to }
 
   def receiver_double(method)
     double('receiver').tap do |receiver|
-      receiver.stub(method).and_return :called
+      allow(receiver).to receive(method).and_return(:called)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquid-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Chamnap Chhorn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,16 +28,16 @@ dependencies:
   name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,7 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -74,6 +75,7 @@ files:
 - gemfiles/rails_32.gemfile
 - gemfiles/rails_40.gemfile
 - gemfiles/rails_41.gemfile
+- gemfiles/rails_42.gemfile
 - lib/liquid-rails.rb
 - lib/liquid-rails/drops/collection_drop.rb
 - lib/liquid-rails/drops/drop.rb
@@ -85,6 +87,7 @@ files:
 - lib/liquid-rails/filters/google_static_map_url_filter.rb
 - lib/liquid-rails/filters/misc_filter.rb
 - lib/liquid-rails/filters/number_filter.rb
+- lib/liquid-rails/filters/paginate_filter.rb
 - lib/liquid-rails/filters/sanitize_filter.rb
 - lib/liquid-rails/filters/text_filter.rb
 - lib/liquid-rails/filters/translate_filter.rb
@@ -111,12 +114,15 @@ files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/concerns/.keep
+- spec/dummy/app/controllers/foospace/bar_controller.rb
 - spec/dummy/app/controllers/home_controller.rb
 - spec/dummy/app/controllers/pages_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.keep
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/concerns/.keep
+- spec/dummy/app/views/foospace/bar/_partial.liquid
+- spec/dummy/app/views/foospace/bar/index_partial.liquid
 - spec/dummy/app/views/home/_partial.liquid
 - spec/dummy/app/views/home/index.liquid
 - spec/dummy/app/views/home/index_partial.liquid
@@ -189,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Renders liquid templates with layout and partial support
@@ -201,12 +207,15 @@ test_files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/concerns/.keep
+- spec/dummy/app/controllers/foospace/bar_controller.rb
 - spec/dummy/app/controllers/home_controller.rb
 - spec/dummy/app/controllers/pages_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.keep
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/concerns/.keep
+- spec/dummy/app/views/foospace/bar/_partial.liquid
+- spec/dummy/app/views/foospace/bar/index_partial.liquid
 - spec/dummy/app/views/home/_partial.liquid
 - spec/dummy/app/views/home/index.liquid
 - spec/dummy/app/views/home/index_partial.liquid