Support Liquid 4 and Rails 5

Author: chamnap

.travis.yml

@@ -5,16 +5,11 @@ rvm:
 env:
   - CODECLIMATE_REPO_TOKEN=891d362268d07d6ff0f5534f92252b6195f6be8795054d3627643eb6314a8c9e
 gemfile:
-  - gemfiles/rails_32.gemfile
-  - gemfiles/rails_40.gemfile
-  - gemfiles/rails_41.gemfile
-  - gemfiles/rails_42.gemfile
+  - gemfiles/rails_50.gemfile
+  - gemfiles/rails_51.gemfile
+  - gemfiles/rails_52.gemfile
 notifications:
   email: false
-matrix:
-  exclude:
-    - rvm: 2.2.0
-      gemfile: gemfiles/rails_32.gemfile
 addons:
   code_climate:
     repo_token: 891d362268d07d6ff0f5534f92252b6195f6be8795054d3627643eb6314a8c9e

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Overview
 
+## 0.2.0
+
+### Resolved Issues
+
+* Fix `Content-Type` issue
+* Support from Liquid v4, Rails v5, and Kaminari v1 and up
+* Use `ActionView::Resolver` as Liquid filesystem (lowang, streppa-ent)
+
 ## 0.1.4
 
 ### Resolved Issues

Gemfile

@@ -3,11 +3,12 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in liquid-rails.gemspec
 gemspec
 
-gem 'rails',       '~> 4.2.10'
+gem 'rails',       '~> 5.0.6'
 gem 'rake',        '~> 12.3.0'
 gem 'rspec-rails', '~> 3.5.2'
 gem 'guard-rspec', '~> 4.7.3'
 gem 'capybara',    '~> 2.16.1'
 gem 'pry-rails',   '~> 0.3.6'
 gem 'coveralls',   '~> 0.8.21'
 gem 'simplecov',   '~> 0.14.1'
+gem 'sqlite3',     '~> 1.3.13'

Rakefile

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

gemfiles/rails_42.gemfile

@@ -1,13 +1,13 @@
 source 'https://rubygems.org'
 
-gem 'rails',       '~> 3.2.21'
+gem 'rails',       '~> 5.0.6'
 gem 'rake',        '~> 12.3.0'
 gem 'rspec-rails', '~> 3.5.2'
 gem 'guard-rspec', '~> 4.7.3'
 gem 'capybara',    '~> 2.16.1'
-gem 'test-unit',   '~> 3.0'
 gem 'pry-rails',   '~> 0.3.6'
 gem 'coveralls',   '~> 0.8.21'
 gem 'simplecov',   '~> 0.14.1'
+gem 'sqlite3',     '~> 1.3.13'
 
 gemspec path: '../'

gemfiles/rails_32.gemfile renamed to gemfiles/rails_50.gemfile

@@ -1,12 +1,13 @@
 source 'https://rubygems.org'
 
-gem 'rails',       '~> 4.0.13'
+gem 'rails',       '~> 5.1.4'
 gem 'rake',        '~> 12.3.0'
 gem 'rspec-rails', '~> 3.5.2'
 gem 'guard-rspec', '~> 4.7.3'
 gem 'capybara',    '~> 2.16.1'
 gem 'pry-rails',   '~> 0.3.6'
 gem 'coveralls',   '~> 0.8.21'
 gem 'simplecov',   '~> 0.14.1'
+gem 'sqlite3',     '~> 1.3.13'
 
 gemspec path: '../'

gemfiles/rails_40.gemfile renamed to gemfiles/rails_51.gemfile

@@ -1,12 +1,13 @@
 source 'https://rubygems.org'
 
-gem 'rails',       '~> 4.1.9'
+gem 'rails',       '~> 5.2.0.beta2'
 gem 'rake',        '~> 12.3.0'
 gem 'rspec-rails', '~> 3.5.2'
 gem 'guard-rspec', '~> 4.7.3'
 gem 'capybara',    '~> 2.16.1'
 gem 'pry-rails',   '~> 0.3.6'
 gem 'coveralls',   '~> 0.8.21'
 gem 'simplecov',   '~> 0.14.1'
+gem 'sqlite3',     '~> 1.3.13'
 
 gemspec path: '../'

gemfiles/rails_41.gemfile renamed to gemfiles/rails_52.gemfile

@@ -20,4 +20,4 @@ def self.setup_drop(base)
 end
 
 require 'liquid-rails/railtie' if defined?(Rails)
-Dir[File.dirname(__FILE__) + '/liquid-rails/{filters,tags,drops}/*.rb'].each { |f| require f }
+Dir[File.dirname(__FILE__) + '/liquid-rails/{filters,tags,drops}/*.rb'].each { |f| require f }

lib/liquid-rails.rb

@@ -2,11 +2,36 @@
 
 module Liquid
   module Rails
-    class FileSystem < ::Liquid::LocalFileSystem
-      def read_template_file(template_path, context)
-        controller_path = context.registers[:controller].controller_path
+    class FileSystem
+      def initialize(view)
+        @view = view
+      end
+
+      def read_template_file(template_path)
+        controller_path = view.controller_path
         template_path   = "#{controller_path}/#{template_path}" unless template_path.include?('/')
-        super
+
+        name    = template_path.split('/').last
+        prefix  = template_path.split('/')[0...-1].join('/')
+
+        result  = view.view_paths.find_all(name, prefix, true, lookup_details)
+        raise FileSystemError, "No such template '#{template_path}'" unless result.present?
+
+        result.first.source
+      end
+
+      private
+
+      attr_reader :view
+
+      def lookup_details
+        {
+          locale:   [view.locale, :en],
+          formats:  view.formats,
+          variants: [],
+          handlers: [:liquid],
+          versions: []
+        }
       end
     end
   end