slim-rails 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85d2a7934c6ad9ff0ae65c4da40ee1a7f22de8c82cf457898e977153bb3f5fa6
-  data.tar.gz: 6ae09a270eaed5a03d87eb2a7999ef7310030ece13167efe32290ae56088cfdd
+  metadata.gz: 4c09a72b540b1eeeb00a3fa4a3a35fa6cb34d064104a9a7155f14ecee5e7e39d
+  data.tar.gz: 2210937c961529642a2fc5ff485dd13de10f46694259d74d0521593182e095c0
 SHA512:
-  metadata.gz: 5384a517144559f59493d78a1da1b5483680d89974495d91a58197b6fb5ff2655b2ca47a22e24b1e45fd074fa3f34abc00d47d727263ce7a8171ae3f80913835
-  data.tar.gz: ac6118fbbe095c820280e0d12304d2443a9d18ca486f652a645c3ebaae57d0e06c8d4f610faaf755f4107548db2e6658ce6c9d07e820acf3201dab92d53467fc
+  metadata.gz: ef5677b920c4a940df436fbad90dbf8e6e97b074f4c6b498a6b9f2b323588280ba5fc6f708dddf4459cb5cb609ea4af0fad03350fd1a013b3bb25b55fa468638
+  data.tar.gz: f77d561a26be9f8967ebd2e7ead43e01c9b9219c1445d88c9c09ca0f271326ca30ab920cb202ecf3cdc90f21edd5d51089f60c2d4d9c739d05ebcf45d186846e

data/.travis.yml

@@ -1,50 +1,45 @@
+dist: focal
+
+os: linux
+
 language: ruby
+
+cache:
+  bundler: true
+
 before_install:
-  - gem install bundler
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
+
 rvm:
   - ruby-head
-  - 2.5
-  - 2.4
-  - 2.3
-  - 2.2
-  - 2.1
-  - 2.0
+  - 3.0
+  - 2.7
+  - 2.6
+
 gemfile:
-  - gemfiles/rails_3.gemfile
-  - gemfiles/rails_4.gemfile
-  - gemfiles/rails_4.1.gemfile
-  - gemfiles/rails_4.2.gemfile
-  - gemfiles/rails_5.gemfile
-  - gemfiles/rails_5.1.gemfile
+  - gemfiles/rails_edge.gemfile
+  - gemfiles/rails_6.1.gemfile
+  - gemfiles/rails_6.0.gemfile
   - gemfiles/rails_5.2.gemfile
-matrix:
+  - gemfiles/rails_5.1.gemfile
+  - gemfiles/rails_5.0.gemfile
+
+jobs:
   allow_failures:
     - rvm: ruby-head
-    - rvm: 2.4
-      gemfile: gemfiles/rails_4.gemfile
-    - rvm: 2.4
-      gemfile: gemfiles/rails_4.1.gemfile
-    - rvm: 2.4
-      gemfile: gemfiles/rails_4.2.gemfile
-    - rvm: 2.5
-      gemfile: gemfiles/rails_4.gemfile
-    - rvm: 2.5
-      gemfile: gemfiles/rails_4.1.gemfile
-    - rvm: 2.5
-      gemfile: gemfiles/rails_4.2.gemfile
+    - gemfile: gemfiles/rails_edge.gemfile
+
   exclude:
-    - rvm: 2.1
-      gemfile: gemfiles/rails_5.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails_5.1.gemfile
-    - rvm: 2.1
+    - rvm: 3.0
       gemfile: gemfiles/rails_5.2.gemfile
-    - rvm: 2.0
-      gemfile: gemfiles/rails_5.gemfile
-    - rvm: 2.0
+    - rvm: 3.0
       gemfile: gemfiles/rails_5.1.gemfile
-    - rvm: 2.0
-      gemfile: gemfiles/rails_5.2.gemfile
+    - rvm: 3.0
+      gemfile: gemfiles/rails_5.0.gemfile
+
+  fast_finish: true
+
 addons:
   code_climate:
     repo_token: 294f0ec8183176c0259b75eb21b38414508616985a7b39fc48fec9dfcf40a52e

data/Appraisals

@@ -1,29 +1,25 @@
-appraise "rails-3" do
-  gem "rails", "~> 3.2"
-  gem 'minitest'
-  gem 'test-unit', '~> 3.0'
+appraise "rails-5.0" do
+  gem "rails", "~> 5.0.0"
+  gem "sprockets", "~> 3.7"
 end
 
-appraise "rails-4" do
-  gem "rails", "~> 4.0.0"
-end
-
-appraise "rails-4.1" do
-  gem "rails", "~> 4.1.0"
+appraise "rails-5.1" do
+  gem "rails", "~> 5.1.0"
+  gem "sprockets", "~> 3.7"
 end
 
-appraise "rails-4.2" do
-  gem "rails", "~> 4.2.0"
+appraise "rails-5.2" do
+  gem "rails", "~> 5.2.0"
 end
 
-appraise "rails-5" do
- gem "rails", "~> 5.0.0"
+appraise "rails-6.0" do
+  gem "rails", "~> 6.0.3"
 end
 
-appraise "rails-5.1" do
- gem "rails", "~> 5.1.0"
+appraise "rails-6.1" do
+  gem "rails", "~> 6.1.3"
 end
 
-appraise "rails-5.2" do
- gem "rails", "~> 5.2.0"
+appraise "rails-edge" do
+  gem "rails", github: 'rails/rails'
 end

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 3.3.0 (July 19, 2021)
+
+* Enabled asset helpers in precompiled templates  (#135)
+* Tested with Rails 6.0, 6.1 and Ruby 3.0
+* Improved CI and tests with Sprockets 4
+
+
 ## 3.2.0 (October 7, 2018)
 
 * Support for Slim 4

data/README.md

@@ -18,6 +18,8 @@ gem "slim-rails"
 
 And that's it.
 
+If you have existing `.erb` templates, check out [our guide](https://github.com/slim-template/slim/wiki/Template-Converters-ERB-to-SLIM) on how to achieve this.
+
 From the version 0.2.0, there is no need to include gem "slim" in your Gemfile.
 
 Every time you generate a controller or scaffold, you'll get Slim templates.

data/gemfiles/{rails_5.gemfile → rails_5.0.gemfile}

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5.0.0"
+gem "sprockets", "~> 3.7"
 
 gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5.1.0"
+gem "sprockets", "~> 3.7"
 
 gemspec path: "../"

data/gemfiles/{rails_4.1.gemfile → rails_6.0.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.1.0"
+gem "rails", "~> 6.0.3"
 
 gemspec path: "../"

data/gemfiles/{rails_4.2.gemfile → rails_6.1.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.2.0"
+gem "rails", "~> 6.1.3"
 
 gemspec path: "../"

data/gemfiles/{rails_4.gemfile → rails_edge.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.0.0"
+gem "rails", github: "rails/rails"
 
 gemspec path: "../"

data/lib/generators/slim/mailer/templates/view.html.slim

@@ -1,2 +1,2 @@
 h1 <%= class_name %>#<%= @action %>
-p = @greeting + ", find me in <%= @path %>"
+p = "#{@greeting}, find me in <%= @path %>"

data/lib/generators/slim/mailer/templates/view.text.slim

@@ -1,3 +1,3 @@
 ' <%= class_name %>#<%= @action %>
 = "\r\n" * 2
-' #{@greeting + ", find me in <%= @path %>"}
+' #{@greeting}, find me in <%= @path %>

data/lib/generators/slim/scaffold/templates/_form.html.slim

@@ -1,7 +1,7 @@
 = form_for @<%= singular_table_name %> do |f|
   - if @<%= singular_table_name %>.errors.any?
     #error_explanation
-      h2 = "#{pluralize(@<%= singular_table_name %>.errors.count, "error")} prohibited this <%= singular_table_name %> from being saved:"
+      h2 = "#{pluralize(@<%= singular_table_name %>.errors.count, 'error')} prohibited this <%= singular_table_name %> from being saved:"
       ul
         - @<%= singular_table_name %>.errors.full_messages.each do |message|
           li = message

data/lib/generators/slim/scaffold/templates/edit.html.slim

@@ -5,4 +5,3 @@ h1 Editing <%= singular_table_name %>
 => link_to 'Show', @<%= singular_table_name %>
 '|
 =< link_to 'Back', <%= index_helper %>_path
-

data/lib/generators/slim/scaffold/templates/show.html.slim

@@ -1,6 +1,6 @@
 p#notice = notice
-
 <% attributes.each do |attribute| -%>
+
 p
   strong <%= attribute.human_name %>:
   = @<%= singular_table_name %>.<%= attribute.name %>

data/lib/slim-rails/register_engine.rb

@@ -3,7 +3,8 @@ module Slim
     module RegisterEngine
       class Transformer
         def self.call(input)
-          Slim::Template.new(input[:name]) { input[:data] }.render(nil)
+          context = input[:environment].context_class.new(input)
+          Slim::Template.new(input[:name]) { input[:data] }.render(context)
         end
       end
 

data/lib/slim-rails/version.rb

@@ -1,5 +1,5 @@
 module Slim
   module Rails
-    VERSION = '3.2.0'
+    VERSION = '3.3.0'
   end
 end

data/slim-rails.gemspec

@@ -6,11 +6,11 @@ require 'slim-rails/version'
 Gem::Specification.new do |spec|
   spec.name          = 'slim-rails'
   spec.version       = Slim::Rails::VERSION
-  spec.authors       = ["Leonardo Almeida"]
-  spec.email         = ["lalmeida08@gmail.com"]
+  spec.authors       = ["Leonardo Almeida", "Janusz Mordarski"]
+  spec.email         = ["lalmeida08@gmail.com", "janusz.m@gmail.com"]
 
-  spec.summary       = 'Slim templates generator for Rails 3+'
-  spec.description   = 'Provides the generator settings required for Rails 3+ to use Slim'
+  spec.summary       = 'Slim templates generator for Rails'
+  spec.description   = 'Provides the generator settings required for Rails to use Slim'
   spec.homepage      = 'https://github.com/slim-template/slim-rails'
   spec.license       = 'MIT'
 
@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'slim',       ['>= 3.0', '< 5.0']
 
   spec.add_development_dependency 'sprockets-rails'
+  spec.add_development_dependency 'slim_lint', '~> 0.21.0'
   spec.add_development_dependency 'rocco'
   spec.add_development_dependency 'redcarpet'
   spec.add_development_dependency 'awesome_print'

data/test/lib/generators/slim/controller_generator_test.rb

@@ -2,6 +2,8 @@ require 'test_helper'
 require 'lib/generators/slim/testing_helper'
 
 class Slim::Generators::ControllerGeneratorTest < Rails::Generators::TestCase
+  include SlimLintHelpers
+
   destination File.join(Rails.root)
   tests Rails::Generators::ControllerGenerator
   arguments %w(Account foo bar --template-engine slim)
@@ -14,4 +16,10 @@ class Slim::Generators::ControllerGeneratorTest < Rails::Generators::TestCase
     assert_file File.join("app", "views", "account", "foo.html.slim"), %r(app/views/account/foo\.html\.slim)
     assert_file File.join("app", "views", "account", "bar.html.slim"), %r(app/views/account/bar\.html\.slim)
   end
+
+  test "should generate SlimLint valid templates" do
+    run_generator
+    templates = Dir[File.join(Rails.root, 'app', 'views', '**', '*.slim')]
+    assert_empty lint(templates)
+  end
 end

data/test/lib/generators/slim/mailer_generator_test.rb

@@ -2,6 +2,8 @@ require 'test_helper'
 require 'lib/generators/slim/testing_helper'
 
 class Slim::Generators::MailerGeneratorTest < Rails::Generators::TestCase
+  include SlimLintHelpers
+
   destination File.join(Rails.root)
   tests Rails::Generators::MailerGenerator
   arguments %w(notifier foo bar --template-engine slim)
@@ -17,12 +19,12 @@ class Slim::Generators::MailerGeneratorTest < Rails::Generators::TestCase
     if rails_version >= '5.0'
       assert_file "app/views/notifier_mailer/foo.html.slim" do |view|
         assert_match %r(app/views/notifier_mailer/foo\.html\.slim), view
-        assert_match(/\= @greeting/, view)
+        assert_match(/\#\{@greeting/, view)
       end
 
       assert_file "app/views/notifier_mailer/bar.html.slim" do |view|
         assert_match %r(app/views/notifier_mailer/bar\.html\.slim), view
-        assert_match(/\= @greeting/, view)
+        assert_match(/\#\{@greeting/, view)
       end
 
       assert_file "app/views/notifier_mailer/foo.text.slim" do |view|
@@ -46,12 +48,12 @@ class Slim::Generators::MailerGeneratorTest < Rails::Generators::TestCase
 
         assert_file "app/views/notifier/foo.html.slim" do |view|
           assert_match %r(app/views/notifier/foo\.html\.slim), view
-          assert_match(/\= @greeting/, view)
+          assert_match(/\#\{@greeting/, view)
         end
 
         assert_file "app/views/notifier/bar.html.slim" do |view|
           assert_match %r(app/views/notifier/bar\.html\.slim), view
-          assert_match(/\= @greeting/, view)
+          assert_match(/\#\{@greeting/, view)
         end
 
       end
@@ -67,4 +69,10 @@ class Slim::Generators::MailerGeneratorTest < Rails::Generators::TestCase
       end
     end
   end
+
+  test "should generate SlimLint valid templates" do
+    run_generator
+    templates = Dir[File.join(Rails.root, 'app', 'views', '**', '*.slim')]
+    assert_empty lint(templates)
+  end
 end

data/test/lib/generators/slim/scaffold_generator_test.rb

@@ -2,6 +2,8 @@ require 'test_helper'
 require 'lib/generators/slim/testing_helper'
 
 class Slim::Generators::ScaffoldGeneratorTest < Rails::Generators::TestCase
+  include SlimLintHelpers
+
   destination File.join(Rails.root)
   tests Rails::Generators::ScaffoldGenerator
   arguments %w(product_line title:string price:integer --template-engine slim --orm active-record)
@@ -23,4 +25,10 @@ class Slim::Generators::ScaffoldGeneratorTest < Rails::Generators::TestCase
     assert_no_file File.join "app", "views", "product_lines"
     assert_no_file File.join "app", "views", "layouts", "product_lines.html.slim"
   end
+
+  test "should generate SlimLint valid templates" do
+    run_generator
+    templates = Dir[File.join(Rails.root, 'app', 'views', '**', '*.slim')]
+    assert_empty lint(templates)
+  end
 end

data/test/lib/generators/slim/testing_helper.rb

@@ -1 +1,11 @@
+require 'slim_lint'
+
+module SlimLintHelpers
+  EXCLUDED_LINTERS = %w[LineLength]
+
+  def lint(templates)
+    SlimLint::Runner.new.run(files: templates, excluded_linters: EXCLUDED_LINTERS).lints.map(&:message)
+  end
+end
+
 require_generators slim: ['scaffold', 'controller', 'mailer']

data/test/lib/slim-rails_assets_test.rb

@@ -1,9 +1,14 @@
+require 'sprockets'
 require 'test_helper'
 require 'tmpdir'
 
 class Slim::Rails::AssetsTest < ActiveSupport::TestCase
   def with_app(use_sprockets, code)
     Dir.mktmpdir do |dir|
+      manifest_path = File.join(dir, 'app', 'assets', 'config', 'manifest.js')
+      FileUtils.mkdir_p(File.dirname(manifest_path))
+      File.write(manifest_path, '//= link_tree ../html .slim')
+
       app_path = File.join(dir, 'app.rb')
       File.write(app_path, <<-APP)
       require 'rails'
@@ -18,17 +23,50 @@ class Slim::Rails::AssetsTest < ActiveSupport::TestCase
       #{code}
       APP
 
+      if use_sprockets && Sprockets::VERSION.to_i >= 4
+        manifest_path = File.join(dir, 'app', 'assets', 'config', 'manifest.js')
+        FileUtils.mkdir_p(File.dirname(manifest_path))
+        File.write(manifest_path, '')
+      end
+
       asset_path = File.join(dir, 'app', 'assets', 'html', 'test.slim')
       FileUtils.mkdir_p(File.dirname(asset_path))
       File.write(asset_path, ".test\n  | hi")
 
+      asset_path = File.join(dir, 'app', 'assets', 'html', 'test_helpers.slim')
+      File.write(asset_path, '= logical_path')
+
       `BUNDLE_GEMFILE=#{ENV['BUNDLE_GEMFILE']} bundle exec ruby #{app_path}`
     end
   end
 
-  test 'compile slim view' do
-    assert_equal 'ok', with_app(false, 'print DummyApp.assets || "ok"')
-    assert_equal '<div class="test">hi</div>', with_app(true, 'print DummyApp.assets["test.slim"].to_s')
-    assert_equal '<div class="test">hi</div>', with_app(true, 'print DummyApp.assets["test", accept: "text/html"].to_s')
+  test "should work without Sprockets" do
+    assert_equal '', with_app(false, 'DummyApp.assets')
+  end
+
+  test "should return HTML version when passing 'text/html' content type" do
+    assert_equal '<div class="test">hi</div>', with_app(true, 'print DummyApp.assets["test", accept: "text/html"]')
+  end
+
+  if Sprockets::VERSION.to_i < 4
+    test "should return HTML version when passing '.slim' extension" do
+      assert_equal '<div class="test">hi</div>', with_app(true, 'print DummyApp.assets["test.slim"]')
+    end
+  end
+
+  if Sprockets::VERSION.to_i >= 3
+    test "should return HTML version when passing '.html' extension" do
+      assert_equal '<div class="test">hi</div>', with_app(true, 'print DummyApp.assets["test.html"]')
+    end
+  end
+
+  if Sprockets::VERSION.to_i >= 4
+    test "should return Slim version when passing '.slim' extension" do
+      assert_equal ".test\n  | hi", with_app(true, 'print DummyApp.assets["test.slim"]')
+    end
+  end
+
+  test "should work with asset helpers" do
+    assert_equal 'test_helpers', with_app(true, 'print DummyApp.assets["test_helpers", accept: "text/html"]')
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: slim-rails
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Leonardo Almeida
-autorequire: 
+- Janusz Mordarski
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-07 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -72,6 +73,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: slim_lint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: rocco
   requirement: !ruby/object:Gem::Requirement
@@ -142,9 +157,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Provides the generator settings required for Rails 3+ to use Slim
+description: Provides the generator settings required for Rails to use Slim
 email:
 - lalmeida08@gmail.com
+- janusz.m@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -157,13 +173,12 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/rails_3.gemfile
-- gemfiles/rails_4.1.gemfile
-- gemfiles/rails_4.2.gemfile
-- gemfiles/rails_4.gemfile
+- gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
-- gemfiles/rails_5.gemfile
+- gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
+- gemfiles/rails_edge.gemfile
 - lib/generators/slim/controller/controller_generator.rb
 - lib/generators/slim/controller/templates/view.html.slim
 - lib/generators/slim/mailer/mailer_generator.rb
@@ -192,7 +207,7 @@ homepage: https://github.com/slim-template/slim-rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -207,11 +222,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
-summary: Slim templates generator for Rails 3+
+summary: Slim templates generator for Rails
 test_files:
 - test/fixtures/routes.rb
 - test/lib/generators/slim/controller_generator_test.rb

data/gemfiles/rails_3.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 3.2"
-gem "minitest"
-gem "test-unit", "~> 3.0"
-
-gemspec path: "../"