slim 4.0.1 → 5.0.0

data/test/literate/TESTS.md

@@ -95,13 +95,13 @@ renders as
 You can embed html code in the text which is not escaped.
 
 ~~~ slim
-| <a href="http://slim-lang.com">slim-lang.com</a>
+| <a href="http://github.com/slim-template/slim">github.com/slim-template/slim</a>
 ~~~
 
 renders as
 
 ~~~ html
-<a href="http://slim-lang.com">slim-lang.com</a>
+<a href="http://github.com/slim-template/slim">github.com/slim-template/slim</a>
 ~~~
 
 ### Text with trailing white space `'`
@@ -122,13 +122,13 @@ This is especially useful if you use tags behind a text block.
 
 ~~~ slim
 ' Link to
-a href="http://slim-lang.com" slim-lang.com
+a href="http://github.com/slim-template/slim" github.com/slim-template/slim
 ~~~
 
 renders as
 
 ~~~ html
-Link to <a href="http://slim-lang.com">slim-lang.com</a>
+Link to <a href="http://github.com/slim-template/slim">github.com/slim-template/slim</a>
 ~~~
 
 Multiple lines can be indented beneath the first text line.
@@ -186,13 +186,13 @@ lines
 HTML can be written directly.
 
 ~~~ slim
-<a href="http://slim-lang.com">slim-lang.com</a>
+<a href="http://github.com/slim-template/slim">github.com/slim-template/slim</a>
 ~~~
 
 renders as
 
 ~~~ html
-<a href="http://slim-lang.com">slim-lang.com</a>
+<a href="http://github.com/slim-template/slim">github.com/slim-template/slim</a>
 ~~~
 
 HTML tags allow nested blocks inside.
@@ -368,7 +368,7 @@ You don't need the explicit `\` if the line ends with a comma `,`.
 
 ~~~ slim
 ruby:
-  def test(*args)
+  def self.test(*args)
     args.join('-')
   end
 = test('arg1',
@@ -800,31 +800,31 @@ If a delimiter makes the syntax more readable for you, you can use the character
 
 ~~~ slim
 li
-  a(href="http://slim-lang.com" class="important") Link
+  a(href="http://github.com/slim-template/slim" class="important") Link
 li
-  a[href="http://slim-lang.com" class="important"] Link
+  a[href="http://github.com/slim-template/slim" class="important"] Link
 li
-  a{href="http://slim-lang.com" class="important"} Link
+  a{href="http://github.com/slim-template/slim" class="important"} Link
 ~~~
 
 renders as
 
 ~~~ html
 <li>
-  <a class="important" href="http://slim-lang.com">Link</a>
+  <a class="important" href="http://github.com/slim-template/slim">Link</a>
 </li>
 <li>
-  <a class="important" href="http://slim-lang.com">Link</a>
+  <a class="important" href="http://github.com/slim-template/slim">Link</a>
 </li>
 <li>
-  <a class="important" href="http://slim-lang.com">Link</a>
+  <a class="important" href="http://github.com/slim-template/slim">Link</a>
 </li>
 ~~~
 
 If you wrap the attributes, you can spread them across multiple lines:
 
 ~~~ slim
-a(href="http://slim-lang.com"
+a(href="http://github.com/slim-template/slim"
 
      class="important") Link
 ~~~
@@ -832,7 +832,7 @@ a(href="http://slim-lang.com"
 renders as
 
 ~~~ html
-<a class="important" href="http://slim-lang.com">Link</a>
+<a class="important" href="http://github.com/slim-template/slim">Link</a>
 ~~~
 
 ~~~ slim
@@ -872,19 +872,19 @@ renders as
 You can use single or double quotes for simple text attributes.
 
 ~~~ slim
-a href="http://slim-lang.com" title='Slim Homepage' Goto the Slim homepage
+a href="http://github.com/slim-template/slim" title='Slim Homepage' Goto the Slim homepage
 ~~~
 
 renders as
 
 ~~~ html
-<a href="http://slim-lang.com" title="Slim Homepage">Goto the Slim homepage</a>
+<a href="http://github.com/slim-template/slim" title="Slim Homepage">Goto the Slim homepage</a>
 ~~~
 
 You can use text interpolation in the quoted attributes:
 
 ~~~ slim
-- url='slim-lang.com'
+- url='github.com/slim-template/slim'
 a href="http://#{url}" Goto the #{url}
 a href="{"test"}" Test of quoted text in braces
 ~~~
@@ -892,7 +892,7 @@ a href="{"test"}" Test of quoted text in braces
 renders as
 
 ~~~ html
-<a href="http://slim-lang.com">Goto the slim-lang.com</a><a href="{&quot;test&quot;}">Test of quoted text in braces</a>
+<a href="http://github.com/slim-template/slim">Goto the github.com/slim-template/slim</a><a href="{&quot;test&quot;}">Test of quoted text in braces</a>
 ~~~
 
 The attribute value will be escaped by default. Use == if you want to disable escaping in the attribute.
@@ -961,7 +961,7 @@ You don't need the explicit `\` if the line ends with a comma `,`.
 
 ~~~ slim
 ruby:
-  def test(*args)
+  def self.test(*args)
     args.join('-')
   end
 a href=test('arg1',
@@ -1040,13 +1040,13 @@ You can configure attributes to be merged if multiple are given (See option `:me
 this is done for class attributes with the white space as delimiter.
 
 ~~~ slim
-a.menu class="highlight" href="http://slim-lang.com/" Slim-lang.com
+a.menu class="highlight" href="http://github.com/slim-template/slim/" github.com/slim-template/slim
 ~~~
 
 renders as
 
 ~~~ html
-<a class="menu highlight" href="http://slim-lang.com/">Slim-lang.com</a>
+<a class="menu highlight" href="http://github.com/slim-template/slim/">github.com/slim-template/slim</a>
 ~~~
 
 You can also use an `Array` as attribute value and the array elements will be merged using the delimiter.
@@ -1073,8 +1073,8 @@ with the :tag key.
 
 ~~~ slim
 ruby:
-  def a_unless_current
-    @page_current ? {tag: 'span'} : {tag: 'a', href: 'http://slim-lang.com/'}
+  def self.a_unless_current
+    @page_current ? {tag: 'span'} : {tag: 'a', href: 'http://github.com/slim-template/slim/'}
   end
 - @page_current = true
 *a_unless_current Link
@@ -1085,7 +1085,7 @@ ruby:
 renders as
 
 ~~~ html
-<span>Link</span><a href="http://slim-lang.com/">Link</a>
+<span>Link</span><a href="http://github.com/slim-template/slim/">Link</a>
 ~~~
 
 ### Shortcuts
@@ -1186,13 +1186,15 @@ renders to
 
 #### ID shortcut and class shortcut `.`
 
-ID and class shortcuts can contain dashes.
+ID and class shortcuts can contain dashes, slashes with digits, and colons.
 
 ~~~ slim
 .-test text
 #test- text
 .--a#b- text
 .a--test-123#--b text
+.a-1/2#b-1/2 text
+.ab:c-test#d:e text
 ~~~
 
 renders as
@@ -1210,6 +1212,12 @@ renders as
 <div class="a--test-123" id="--b">
   text
 </div>
+<div class="a-1/2" id="b-1/2">
+  text
+</div>
+<div class="ab:c-test" id="d:e">
+  text
+</div>
 ~~~
 
 ## Text interpolation

data/test/literate/run.rb

@@ -65,9 +65,9 @@ class LiterateTest < Temple::Engine
       @in_testcase = false
       result =  "  html = #{code.inspect}\n"
       if @opts.empty?
-        result << "  render(slim).must_equal html\nend\n"
+        result << "  _(render(slim)).must_equal html\nend\n"
       else
-        result << "  options = #{@opts.inspect}\n  render(slim, options).must_equal html\nend\n"
+        result << "  options = #{@opts.inspect}\n  _(render(slim, options)).must_equal html\nend\n"
       end
     end
 

data/test/rails/app/assets/config/manifest.js

@@ -0,0 +1 @@
+// file required by sprockets >= 4.0

data/test/rails/config/application.rb

@@ -5,8 +5,7 @@ require 'action_controller/railtie'
 require 'action_view/railtie'
 #require 'active_record/railtie'
 #require 'action_mailer/railtie'
-require "sprockets/railtie"
-
+require 'sprockets/railtie'
 require 'slim'
 
 module Dummy
@@ -41,20 +40,5 @@ module Dummy
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
-
-    # From slim-rails fix for "ActionView::Template::Error: Unknown line indicator"
-    # https://github.com/slim-template/slim-rails/blob/991589ea5648e5e896781e68912bc51beaf4102a/lib/slim-rails/register_engine.rb
-    if config.respond_to?(:assets)
-      config.assets.configure do |env|
-        if env.respond_to?(:register_transformer) && Sprockets::VERSION.to_i > 3
-          env.register_mime_type 'text/slim', extensions: ['.slim', '.slim.html']
-          env.register_transformer 'text/slim', 'text/html', RegisterEngine::Transformer
-        elsif env.respond_to?(:register_engine)
-          args = ['.slim', Slim::Template]
-          args << { silence_deprecation: true } if Sprockets::VERSION.start_with?('3')
-          env.register_engine(*args)
-        end
-      end
-    end
   end
 end

data/test/rails/test/test_slim.rb

@@ -46,18 +46,12 @@ class TestSlim < ActionDispatch::IntegrationTest
     assert_html "<h1>Hello Slim!</h1><p>With a partial!</p>"
   end
 
-  if RUBY_ENGINE == 'jruby' && RUBY_ENGINE < '2.2.0'
-    puts 'Streaming test disabled for JRuby < 9000.',
-      'See https://github.com/jruby/jruby/issues/1243',
-      'and https://github.com/jruby/jruby/issues/1789'
-  else
-    puts 'Streaming test enabled.'
-    test "streaming" do
-      get "/slim/streaming"
-      output = "2f\r\n<!DOCTYPE html><html><head><title>Dummy</title>\r\nd\r\n</head><body>\r\n17\r\nHeading set from a view\r\n15\r\n<div class=\"content\">\r\n53\r\n<p>Page content</p><h1><p>Hello Streaming!</p></h1><h2><p>Hello Streaming!</p></h2>\r\n14\r\n</div></body></html>\r\n0\r\n\r\n"
-      assert_equal output, @response.body
-    end
-  end
+  # TODO Reenable streaming test
+  # test "streaming" do
+  #   get "/slim/streaming"
+  #   output = "2f\r\n<!DOCTYPE html><html><head><title>Dummy</title>\r\nd\r\n</head><body>\r\n17\r\nHeading set from a view\r\n15\r\n<div class=\"content\">\r\n53\r\n<p>Page content</p><h1><p>Hello Streaming!</p></h1><h2><p>Hello Streaming!</p></h2>\r\n14\r\n</div></body></html>\r\n0\r\n\r\n"
+  #   assert_equal output, @response.body
+  # end
 
   test "render integers" do
     get "/slim/integers"

data/test/sinatra/helper.rb

@@ -8,8 +8,6 @@ if ENV['COVERAGE']
 end
 
 ENV['APP_ENV'] = 'test'
-Encoding.default_external = "UTF-8" if defined? Encoding
-
 RUBY_ENGINE = 'ruby' unless defined? RUBY_ENGINE
 
 require 'rack'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 5.0.0
 platform: ruby
 authors:
 - Daniel Mendler
@@ -10,28 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-02 00:00:00.000000000 Z
+date: 2023-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.6
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.6
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -63,8 +57,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
 - ".yardopts"
 - CHANGES
 - Gemfile
@@ -106,6 +100,7 @@ files:
 - lib/slim/logic_less/context.rb
 - lib/slim/logic_less/filter.rb
 - lib/slim/parser.rb
+- lib/slim/railtie.rb
 - lib/slim/smart.rb
 - lib/slim/smart/escaper.rb
 - lib/slim/smart/filter.rb
@@ -148,6 +143,7 @@ files:
 - test/literate/run.rb
 - test/logic_less/test_logic_less.rb
 - test/rails/Rakefile
+- test/rails/app/assets/config/manifest.js
 - test/rails/app/controllers/application_controller.rb
 - test/rails/app/controllers/entries_controller.rb
 - test/rails/app/controllers/slim_controller.rb
@@ -176,7 +172,6 @@ files:
 - test/rails/config/initializers/backtrace_silencers.rb
 - test/rails/config/initializers/inflections.rb
 - test/rails/config/initializers/mime_types.rb
-- test/rails/config/initializers/secret_token.rb
 - test/rails/config/initializers/session_store.rb
 - test/rails/config/locales/en.yml
 - test/rails/config/routes.rb
@@ -194,7 +189,7 @@ files:
 - test/sinatra/views/layout2.slim
 - test/smart/test_smart_text.rb
 - test/translator/test_translator.rb
-homepage: http://slim-lang.com/
+homepage: http://github.com/slim-template/slim/
 licenses:
 - MIT
 metadata: {}
@@ -206,15 +201,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: Slim is a template language.

data/.travis.yml

@@ -1,35 +0,0 @@
-# https://www.ruby-lang.org/en/downloads/releases/
-language: ruby
-rvm:
-  - 2.5.1
-  - 2.5.0
-  - 2.4.4
-  - 2.4.3
-  - jruby-9.2.0.0
-  - jruby-9.1.17.0
-
-# Recommend sudo required when using trusty dist
-# https://docs.travis-ci.com/user/reference/trusty/
-sudo: required
-dist: trusty
-
-script: "bundle exec rake $TASK"
-
-after_success:
-  - bundle exec codeclimate-test-reporter
-
-env:
-  global:
-    # travis encrypt CODECLIMATE_REPO_TOKEN=???
-    - secure: "a7sD9iwPJJn3Fj+mn62GAmy/PEguh3elrilsp1KS+WfDiCiIKD8Q5KG2Jv67DGcQAGI3dPWeh7+ZhZ/W7nEipwWUBmSvGYVeoF63y8j6mNRLeekqspj94l47hXyFePj9bCadY1b1/xY4lE1pMEU8eA8AOUHUqCSuH+Kk/MuvyLM="
-  matrix:
-    - "TASK=test:core_and_plugins"
-    - "TASK=test:rails RAILS=5.2.0"
-    - "TASK=test:rails RAILS=5.1.6"
-    - "TASK=test:sinatra SINATRA=2.0.1"
-    - "TASK=test:sinatra SINATRA=1.4.8"
-    - "TASK=bench"
-    - "TASK=bench slow=1"
-
-notifications:
-  irc: "chat.freenode.net#slim-lang"

data/test/rails/config/initializers/secret_token.rb

@@ -1,7 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Your secret key for verifying the integrity of signed cookies.
-# If you change this key, all old signed cookies will become invalid!
-# Make sure the secret is at least 30 characters and all random,
-# no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = Dummy::Application.config.secret_key_base = '123a9119fb14a410f485f9390286b33f2743b9d348246cf3e4434522078f77c202d7a1fb7e42666dd0844bcb10d0ff3d8b4ee087796269d4c574837948512dbf'