slim 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69d6aa964ff22bb2b6cfc10cfbf3073e2f3c4256a47607f49500d4c54010bf60
-  data.tar.gz: fe1d48dd358b5e44f3f639e55284e2c81d7859d62a7feb10e51985675394ba95
+  metadata.gz: 374bad17fd98e439f41336ea3a634afd4e918708803ada3d211071e565d3ba34
+  data.tar.gz: 94a7178a4263ec906413f4f5ce921fa2ddb12423fcd6e28bbb8fbd456bc2ebb5
 SHA512:
-  metadata.gz: 1410081c98ad63fdbae03019edd862177b19ad675f0f3aa151dc2cdbbe4275ea17751b69eded1ebf0ddeed773d5f44b3325f74b5fa15f7ee67575df62a3f173d
-  data.tar.gz: af294f677929992cd72f76db74e99e111096379a924daf83a7c54515321bcca5ff92e45a40a50c839a88c5ab515458c87f64cd56ea3bab116a9e26804538fa0f
+  metadata.gz: 282bb0085cd7e91ddffbc4fc9af6ab82ec4478ef2090a82592bf96a395f2ad172c6af9f1010f5e0e9cee57281c487e5e2bb4b25a75e2eac0df02018bc298faf9
+  data.tar.gz: 7924d7af215643a8207b738f3f97c46f32bb990db7a103987f14b8b9558ec7de9208aaf27c65840d7caa7d60c156e56f6f876dd7ff54190da91fc436ccc75842

data/.travis.yml

@@ -1,11 +1,10 @@
 # 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
+  - 2.6.1
+  - 2.5.3
+  - 2.4.5
+  - jruby-9.2.6.0
   - jruby-9.1.17.0
 
 # Recommend sudo required when using trusty dist
@@ -20,16 +19,20 @@ after_success:
 
 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"
+    - "TASK=test:rails RAILS=6.0.0.beta2"
+    - "TASK=test:rails RAILS=5.2.2"
+    - "TASK=test:rails RAILS=5.2.1.1"
+    - "TASK=test:rails RAILS=5.2.1"
+    - "TASK=test:sinatra SINATRA=2.0.5"
+    - "TASK=test:sinatra SINATRA=2.0.4"
+    - "TASK=test:sinatra SINATRA=2.0.3"
 
-notifications:
-  irc: "chat.freenode.net#slim-lang"
+matrix:
+  exclude:
+    - rvm: 2.4.5
+      env: "TASK=test:rails RAILS=6.0.0.beta2"
+    - rvm: jruby-9.1.17.0
+      env: "TASK=test:rails RAILS=6.0.0.beta2"

data/CHANGES

@@ -1,3 +1,7 @@
+4.1.0 (2020-05-07)
+  * Add support for Tailwind CSS - #841
+  * Update dependencies and testing
+  
 4.0.1 (2018-09-02)
 
   * Fix incompatibility issue with Slim Include plugin and new ability to specifiy attributes for embedded engines #819

data/Gemfile

@@ -7,6 +7,12 @@ group :test do
   gem 'rack-test'
 end
 
+group :perf do
+  gem 'benchmark-ips'
+  gem 'erubis'
+  gem 'haml'
+end
+
 if ENV['TRAVIS']
   gem 'rails-controller-testing'
 end
@@ -30,19 +36,12 @@ if ENV['RAILS']
   else
     gem 'rails', "= #{ENV['RAILS']}"
   end
-end
 
-#Choose minitest 4.7.x for sinatra < 1.4.6 or rails 3 and 4.0 otherwise go for newer version
-if (ENV['SINATRA'] && ENV['SINATRA'] < '1.4.6') || (ENV['RAILS'] && ENV['RAILS'].match(/^(3|4\.0)/))
-  gem 'minitest', '~> 4.7.4'
-else
-  gem 'minitest', '~> 5.1'
+  gem 'slim-rails', require: false
 end
 
-#Ruby >= 2.2.0 has removed test/unit from Stdlib
-if RUBY_VERSION >= '2.2.0'
-  gem 'test-unit', platforms: :mri
-end
+gem 'test-unit', '~> 3.3', '>= 3.3.5'
+gem 'minitest', '~> 5.14'
 
 if RUBY_ENGINE == 'rbx' && !ENV['TRAVIS']
   gem 'psych'
@@ -56,9 +55,9 @@ if ENV['SINATRA']
   end
 end
 
-gem 'rake', '>= 0.8.7'
-gem 'sass', '>= 3.1.0'
-gem 'kramdown'
+gem 'rake', '~> 13.0', '>= 13.0.1'
+gem 'sassc', '~> 2.2', '>= 2.2.1'
+gem 'kramdown', '~> 2.1'
 
 if ENV['TASK'] == 'bench'
   gem 'benchmark-ips'

data/lib/slim/command.rb

@@ -110,19 +110,19 @@ module Slim
           Template.new(@options[:file]) { @options[:input].read }.render(nil, locals)
         end
 
-      rescue Exception => ex
-        raise ex if @options[:trace] || SystemExit === ex
-        $stderr.print "#{ex.class}: " if ex.class != RuntimeError
-        $stderr.puts ex.message
-        $stderr.puts '  Use --trace for backtrace.'
-        exit 1
-      else
-        unless @options[:output]
-          file = args.shift
-          @options[:output] = file ? File.open(file, 'w') : $stdout
-        end
-        @options[:output].puts(result)
-        exit 0
+    rescue Exception => ex
+      raise ex if @options[:trace] || SystemExit === ex
+      $stderr.print "#{ex.class}: " if ex.class != RuntimeError
+      $stderr.puts ex.message
+      $stderr.puts '  Use --trace for backtrace.'
+      exit 1
+    else
+      unless @options[:output]
+        file = args.shift
+        @options[:output] = file ? File.open(file, 'w') : $stdout
+      end
+      @options[:output].puts(result)
+      exit 0
     end
   end
 end

data/lib/slim/parser.rb

@@ -70,7 +70,7 @@ module Slim
         end
       end
       keys = Regexp.union @attr_shortcut.keys.sort_by {|k| -k.size }
-      @attr_shortcut_re = /\A(#{keys}+)((?:\p{Word}|-)*)/
+      @attr_shortcut_re = /\A(#{keys}+)((?:\p{Word}|-|\/\d+|:(\w|-)+)*)/
       keys = Regexp.union @tag_shortcut.keys.sort_by {|k| -k.size }
       @tag_re = /\A(?:#{keys}|\*(?=[^\s]+)|(\p{Word}(?:\p{Word}|:|-)*\p{Word}|\p{Word}+))/
       keys = Regexp.escape @code_attr_delims.keys.join

data/lib/slim/version.rb

@@ -1,5 +1,5 @@
 module Slim
   # Slim version string
   # @api public
-  VERSION = '4.0.1'
+  VERSION = '4.1.0'
 end

data/test/literate/TESTS.md

@@ -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',
@@ -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',
@@ -1073,7 +1073,7 @@ with the :tag key.
 
 ~~~ slim
 ruby:
-  def a_unless_current
+  def self.a_unless_current
     @page_current ? {tag: 'span'} : {tag: 'a', href: 'http://slim-lang.com/'}
   end
 - @page_current = true
@@ -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/rails/app/assets/config/manifest.js

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

data/test/rails/config/application.rb

@@ -5,9 +5,10 @@ require 'action_controller/railtie'
 require 'action_view/railtie'
 #require 'active_record/railtie'
 #require 'action_mailer/railtie'
-require "sprockets/railtie"
+require 'sprockets/railtie'
 
 require 'slim'
+require 'slim-rails/register_engine'
 
 module Dummy
   class Application < Rails::Application
@@ -48,7 +49,7 @@ module Dummy
       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
+          env.register_transformer 'text/slim', 'text/html', Slim::Rails::RegisterEngine::Transformer
         elsif env.respond_to?(:register_engine)
           args = ['.slim', Slim::Template]
           args << { silence_deprecation: true } if Sprockets::VERSION.start_with?('3')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.0
 platform: ruby
 authors:
 - Daniel Mendler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-02 00:00:00.000000000 Z
+date: 2020-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -148,6 +148,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
@@ -213,8 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Slim is a template language.