liquid-rails 0.1.4 → 0.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d360aa7c06d1c93bf06023b0f4db6b53d572f80
-  data.tar.gz: a9d624b08596805faaa776c47a5ad93aa037dc5a
+  metadata.gz: 474c1915c9a9570eddb80c6707bcd65ae5c19431
+  data.tar.gz: ca005f24e1e6f752122e307cf490c748b5805789
 SHA512:
-  metadata.gz: 9f1630c3e34e20b06e99356aac8ff0f97098457a77e8498f85b0ed726ab6923cefe55d9343ca38131795d47e9933349089ae846aea7a8f54aae33d29b426ddfe
-  data.tar.gz: c5b67fba26918a81ff95741978801fa3c451fd94b0cbd704f43dae0d2920a86d457fa13c909fe8c3de2530d9f41c1c31b13c7a1f6f21caa5c3778561c8bb5d2a
+  metadata.gz: 542d296d6222fb5a2220b04b136f6e5b5a3727cb9d46df4b476bb65b016ab4c698124c2ac19a558eb7929eab766fc99e2c0ad8ec4a6fd57eb554be89d86b7e71
+  data.tar.gz: 05913fa277a644982c94557caa6717a316bd78451a7601ccfefcc3e21e2ee22f14904ab6608ec7d7b577c5f54401551512a6b554147e14d3d6e4e926f2dd26ef

data/.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

data/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

data/Gemfile

@@ -3,7 +3,7 @@ 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'
@@ -11,3 +11,4 @@ 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'

data/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

data/gemfiles/{rails_32.gemfile → rails_50.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: '../'

data/gemfiles/{rails_40.gemfile → rails_51.gemfile}

@@ -1,6 +1,6 @@
 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'
@@ -8,5 +8,6 @@ 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: '../'

data/gemfiles/{rails_41.gemfile → rails_52.gemfile}

@@ -1,6 +1,6 @@
 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'
@@ -8,5 +8,6 @@ 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: '../'

data/lib/liquid-rails.rb

@@ -20,4 +20,4 @@ module Liquid
 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 }

data/lib/liquid-rails/file_system.rb

@@ -2,11 +2,36 @@ require 'liquid/file_system'
 
 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

data/lib/liquid-rails/railtie.rb

@@ -9,11 +9,6 @@ module Liquid
         end
       end
 
-      initializer 'liquid-rails.include_partial' do |app|
-        template_path = ::Rails.root.join('app/views')
-        Liquid::Template.file_system = Liquid::Rails::FileSystem.new(template_path)
-      end
-
       initializer 'liquid-rails.setup_drop' do |app|
         [:active_record, :mongoid].each do |orm|
           ActiveSupport.on_load orm do
@@ -23,4 +18,4 @@ module Liquid
       end
     end
   end
-end
+end

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

@@ -21,7 +21,7 @@ module Liquid
             end
           }
 
-          before(:all)  { setup_view_and_controller }
+          before(:each) { setup_view_and_controller }
           before(:each) { subject.context = context }
         end
       end
@@ -35,4 +35,4 @@ RSpec.configure do |config|
   else
     config.include Liquid::Rails::Rspec::DropExampleGroup, type: :drop, example_group: { file_path: %r{spec/drops} }
   end
-end
+end

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

@@ -8,7 +8,7 @@ module Liquid
         included do
           metadata[:type] = :filter
 
-          before(:all)  { setup_view_and_controller }
+          before(:each)  { setup_view_and_controller }
         end
       end
     end
@@ -21,4 +21,4 @@ RSpec.configure do |config|
   else
     config.include Liquid::Rails::Rspec::FilterExampleGroup, type: :filter, example_group: { file_path: %r{spec/filters} }
   end
-end
+end

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

@@ -8,7 +8,7 @@ module Liquid
         included do
           metadata[:type] = :tag
 
-          before(:all) { setup_view_and_controller }
+          before(:each) { setup_view_and_controller }
         end
       end
     end
@@ -21,4 +21,4 @@ RSpec.configure do |config|
   else
     config.include Liquid::Rails::Rspec::TagExampleGroup, type: :tag, example_group: { file_path: %r{spec/tags} }
   end
-end
+end

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

@@ -6,9 +6,9 @@ module Liquid
 
         def setup_view_and_controller
           @view                 = ActionView::Base.new
-          @controller           = ApplicationController.new
-          @request              = ActionController::TestRequest.new('PATH_INFO' => '/')
-          @response             = ActionController::TestResponse.new
+          @controller           = ActionController::Base.new
+          @request              = ActionDispatch::TestRequest.new({'PATH_INFO' => '/'})
+          @response             = ActionDispatch::TestResponse.new
           @response.request     = @request
           @controller.request   = @request
           @controller.response  = @response
@@ -42,4 +42,4 @@ module Liquid
       end
     end
   end
-end
+end

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

@@ -115,4 +115,4 @@ module Liquid
   end
 end
 
-Liquid::Template.register_tag('paginate', Liquid::Rails::PaginateTag)
+Liquid::Template.register_tag('paginate', Liquid::Rails::PaginateTag)

data/lib/liquid-rails/template_handler.rb

@@ -13,8 +13,6 @@ module Liquid
       end
 
       def render(template, local_assigns={})
-        @view.controller.headers['Content-Type'] ||= 'text/html; charset=utf-8'
-
         assigns = if @controller.respond_to?(:liquid_assigns, true)
           @controller.send(:liquid_assigns)
         else
@@ -23,9 +21,8 @@ module Liquid
         assigns['content_for_layout'] = @view.content_for(:layout) if @view.content_for?(:layout)
         assigns.merge!(local_assigns.stringify_keys)
 
-        liquid = Liquid::Template.parse(template)
-        render_method = (::Rails.env.development? || ::Rails.env.test?) ? :render! : :render
-        liquid.send(render_method, assigns, filters: filters, registers: { view: @view, controller: @controller, helper: @helper }).html_safe
+        liquid      = Liquid::Template.parse(template)
+        liquid.send(render_method, assigns, filters: filters, registers: registers).html_safe
       end
 
       def filters
@@ -36,9 +33,22 @@ module Liquid
         end
       end
 
+      def registers
+        {
+          view: @view,
+          controller: @controller,
+          helper: @helper,
+          file_system: Liquid::Rails::FileSystem.new(@view)
+        }
+      end
+
       def compilable?
         false
       end
+
+      def render_method
+        (::Rails.env.development? || ::Rails.env.test?) ? :render! : :render
+      end
     end
   end
 end

data/lib/liquid-rails/version.rb

@@ -1,5 +1,5 @@
 module Liquid
   module Rails
-    VERSION = '0.1.4'
+    VERSION = '0.2.0.beta1'
   end
 end

data/liquid-rails.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rails',    ">= 3.2", "< 5"
-  spec.add_dependency 'liquid',   '~> 3.0.6'
-  spec.add_dependency 'kaminari', '~> 0.17.0'
+  spec.add_dependency 'rails',    ">= 5.0.6"
+  spec.add_dependency 'liquid',   '~> 4.0.0'
+  spec.add_dependency 'kaminari', '~> 1.1.1'
 end

data/spec/dummy/Rakefile

@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require_relative 'config/application'
 
-Dummy::Application.load_tasks
+Rails.application.load_tasks

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/spec/dummy/app/controllers/home_controller.rb

@@ -1,5 +1,5 @@
 class HomeController < ApplicationController
-  before_filter :set_book
+  before_action :set_book
 
   def index
     render layout: false
@@ -20,9 +20,13 @@ class HomeController < ApplicationController
   def erb_with_html_liquid_partial
   end
 
+  def index_with_rss
+    render layout: false
+  end
+
   private
 
-    def set_book
-      @book = { 'name' => 'Liquid on Rails' }
-    end
+  def set_book
+    @book = { 'name' => 'Liquid on Rails' }
+  end
 end

data/spec/dummy/app/controllers/pages_controller.rb

@@ -1,5 +1,5 @@
 class PagesController < ApplicationController
-  before_filter :set_book
+  before_action :set_book
 
   def index_witout_filter
   end
@@ -13,4 +13,4 @@ class PagesController < ApplicationController
     def set_book
       @book = { 'name' => 'Liquid on Rails' }
     end
-end
+end

data/spec/dummy/app/views/home/index_with_rss.rss.liquid

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+  <channel>
+    <title>The World's Best Blog | Another Epic Site</title>
+    <description>A great description.</description>
+    <language>en</language>
+
+    <item>
+      <title>{{ book.name }}</title>
+      <description>
+        <![CDATA[
+        A book.
+        ]]>
+      </description>
+    </item>
+  </channel>
+</rss>

data/spec/dummy/config.ru

@@ -1,4 +1,5 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require_relative 'config/environment'
+
 run Rails.application

data/spec/dummy/config/application.rb

@@ -1,7 +1,7 @@
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 
 # Pick the frameworks you want:
-require "action_controller/railtie"
+require "rails/all"
 # require "rails/test_unit/railtie"
 
 Bundler.require(*Rails.groups)
@@ -9,17 +9,17 @@ require "liquid-rails"
 
 module Dummy
   class Application < Rails::Application
+    if Rails.version.start_with?('5.1')
+      # Initialize configuration defaults for originally generated Rails version.
+      config.load_defaults 5.1
+    elsif Rails.version.start_with?('5.2')
+      # Initialize configuration defaults for originally generated Rails version.
+      config.load_defaults 5.2
+      config.active_record.sqlite3.represent_boolean_as_integer = true
+    end
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
   end
 end
-