slim 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6aa24cf9ce985085cb2c3f4d43b948aba03bc19afbf165c090f4e4f63497cb6
-  data.tar.gz: 23c6a1e7778c9feca0c85a2e5eee90e8019e008c4bbb58b533be2ad2733a9a41
+  metadata.gz: 69d6aa964ff22bb2b6cfc10cfbf3073e2f3c4256a47607f49500d4c54010bf60
+  data.tar.gz: fe1d48dd358b5e44f3f639e55284e2c81d7859d62a7feb10e51985675394ba95
 SHA512:
-  metadata.gz: e799d123737fd44fd02e9bb889dac596bdea8093db6395759908565325a3670a142589820e534b248d23751ea3de51694723392827ed4fe56b4867abfa4f306f
-  data.tar.gz: '031793ed5801a279b8de180b2058357b3ce35c413b3152dfb6cf30220a574c405ad712aa6d26fbdebb1b27eecc731657bd32001efdf1bf310eef041c1001666f'
+  metadata.gz: 1410081c98ad63fdbae03019edd862177b19ad675f0f3aa151dc2cdbbe4275ea17751b69eded1ebf0ddeed773d5f44b3325f74b5fa15f7ee67575df62a3f173d
+  data.tar.gz: af294f677929992cd72f76db74e99e111096379a924daf83a7c54515321bcca5ff92e45a40a50c839a88c5ab515458c87f64cd56ea3bab116a9e26804538fa0f

data/CHANGES

@@ -1,4 +1,9 @@
+4.0.1 (2018-09-02)
+
+  * Fix incompatibility issue with Slim Include plugin and new ability to specifiy attributes for embedded engines #819
+
 4.0.0 (2018-08-26)
+
   * Add ability to specify attributes for embedded engines using TagEngine - #653
   * Set Tilt's default encoding to utf-8 - #800
   * Prevent generation of invalid Ruby code in heredoc - #770

data/Gemfile

@@ -2,6 +2,11 @@ source 'https://rubygems.org/'
 
 gemspec
 
+group :test do
+  gem 'sinatra'
+  gem 'rack-test'
+end
+
 if ENV['TRAVIS']
   gem 'rails-controller-testing'
 end
@@ -44,12 +49,10 @@ if RUBY_ENGINE == 'rbx' && !ENV['TRAVIS']
 end
 
 if ENV['SINATRA']
-  gem 'rack-test'
   if ENV['SINATRA'] == 'master'
     gem 'sinatra', :github => 'sinatra/sinatra'
   else
-    # Need the slim_test.rb file not included in the Sinatra gem.
-    gem 'sinatra', :github => 'sinatra/sinatra', :tag => "v#{ENV['SINATRA']}"
+    gem 'sinatra', :tag => "v#{ENV['SINATRA']}"
   end
 end
 

data/README.md

@@ -1120,7 +1120,7 @@ Usage: slimrb [options]
     -e, --erb                        Convert to ERB
         --rails                      Generate rails compatible code (Implies --compile)
     -r, --require library            Load library or plugin with -r slim/plugin
-    -p, --pretty                     Produce pretty html
+    -p, --pretty                     Produce pretty html for debugging purposes
     -o, --option name=code           Set slim option
     -l, --locals Hash|YAML|JSON      Set local variables
     -h, --help                       Show this message
@@ -1266,6 +1266,7 @@ Static code analysis:
 
 Template Converters (HAML, ERB, ...):
 
+* [ERB 2 Slim](http://erb2slim.com/)
 * [Haml2Slim converter](https://github.com/slim-template/haml2slim)
 * [ERB2Slim, HTML2Slim converter](https://github.com/slim-template/html2slim)
 

data/Rakefile

@@ -19,67 +19,54 @@ namespace 'test' do
   Rake::TestTask.new('core') do |t|
     t.libs << 'lib' << 'test/core'
     t.test_files = FileList['test/core/test_*.rb']
-    t.verbose = true
+    t.warning = true
     #t.ruby_opts << '-w' << '-v'
   end
 
   Rake::TestTask.new('literate') do |t|
     t.libs << 'lib' << 'test/literate'
     t.test_files = FileList['test/literate/run.rb']
-    t.verbose = true
+    t.warning = true
   end
 
   Rake::TestTask.new('logic_less') do |t|
     t.libs << 'lib' << 'test/core'
     t.test_files = FileList['test/logic_less/test_*.rb']
-    t.verbose = true
+    t.warning = true
   end
 
   Rake::TestTask.new('translator') do |t|
     t.libs << 'lib' << 'test/core'
     t.test_files = FileList['test/translator/test_*.rb']
-    t.verbose = true
+    t.warning = true
   end
 
   Rake::TestTask.new('smart') do |t|
     t.libs << 'lib' << 'test/core'
     t.test_files = FileList['test/smart/test_*.rb']
-    t.verbose = true
+    t.warning = true
   end
 
   Rake::TestTask.new('include') do |t|
     t.libs << 'lib' << 'test/core'
     t.test_files = FileList['test/include/test_*.rb']
-    t.verbose = true
+    t.warning = true
   end
 
   Rake::TestTask.new('rails') do |t|
     t.libs << 'lib'
     t.test_files = FileList['test/rails/test/test_*.rb']
-    t.verbose = true
+    t.warning = true
   end
 
-  begin
-    require 'sinatra'
-    spec = Gem::Specification.find_by_name('sinatra')
-    Rake::TestTask.new('sinatra') do |t|
-      file = "#{spec.gem_dir}/test/slim_test.rb"
-
-      if Sinatra::VERSION =~ /\A1\.3/
-        # FIXME: Rename deprecated attribute
-        code = File.read(file)
-        code.gsub!('attr_wrapper', 'attr_quote')
-        File.open(file, 'w') {|out| out.write(code) }
-      end
-
-      # Run Slim integration test in Sinatra
-      t.test_files = FileList[file]
-      t.verbose = true
-    end
-  rescue LoadError
-    task :sinatra do
-      abort 'Sinatra is not available'
-    end
+  Rake::TestTask.new('sinatra') do |t|
+    t.libs << 'lib'
+    t.test_files = FileList['test/sinatra/test_*.rb']
+
+    # Copied from test task in Sinatra project to mimic their approach
+    t.ruby_opts = ['-r rubygems'] if defined? Gem
+    t.ruby_opts << '-I.'
+    t.warning = true
   end
 end
 

data/lib/slim/filter.rb

@@ -13,8 +13,8 @@ module Slim
     end
 
     # Pass-through handler
-    def on_slim_embedded(type, content)
-      [:slim, :embedded, type, compile(content)]
+    def on_slim_embedded(type, content, attrs)
+      [:slim, :embedded, type, compile(content), attrs]
     end
 
     # Pass-through handler

data/lib/slim/version.rb

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

data/test/core/test_html_attributes.rb

@@ -265,29 +265,4 @@ p
 }
     assert_html '<p><img src="img.png" whatsthis?!="" /><img src="img.png" whatsthis?!="wtf" /></p>', source
   end
-
-  def test_multiline_attribute_with_space
-    source = %q{
-a data-title="help" data-content="extremely long help text that goes on\
- and one and one and then starts over...." Link
-}
-    assert_html '<a data-content="extremely long help text that goes on and one and one and then starts over...." data-title="help">Link</a>', source
-  end
-
-  def test_multiline_attribute_without_space
-    source= %q{
-link rel="stylesheet" type="text/css" href="https://stylesheet-cdn.com/\
- this/is/a/quite/long/url/that/would/be/nice/to/split/up"
-}
-    assert_html '<link rel="stylesheet" type="text/css" href="https://stylesheet-cdn.com/this/is/a/quite/long/url/that/would/be/nice/to/split/up" />', source
-  end
-
-  def test_eme
-    source = %q{
-script#template[type="text/x-template"]
-  div[v-bind:class="{'some-class': boolean_var}"]
-    span contents
-}
-    assert_html '<script></script>', source
-  end
 end

data/test/literate/TESTS.md

@@ -420,18 +420,6 @@ renders as
  49
 ~~~
 
-The legacy syntax `='` is also supported.
-
-~~~ slim
-=' 7*7
-~~~
-
-renders as
-
-~~~ html
-49 
-~~~
-
 The equal sign with modifier `=<` produces dynamic output with a leading white space.
 
 ~~~ slim
@@ -500,18 +488,6 @@ renders as
 <script>evil();</script> 
 ~~~
 
-The legacy syntax `=='` is also supported.
-
-~~~ slim
-==' '<script>evil();</script>'
-~~~
-
-renders as
-
-~~~ html
-<script>evil();</script> 
-~~~
-
 The option option
 
 ~~~ options
@@ -521,7 +497,7 @@ The option option
 doesn't affect the output of `==`.
 
 ~~~ slim
-==' '<script>evil();</script>'
+==> '<script>evil();</script>'
 ~~~
 
 renders as
@@ -709,27 +685,26 @@ renders as
 
 ### Trailing and leading whitespace
 
-You can force a trailing whitespace behind a tag by adding `>`. The legacy syntax with `'` is also supported.
+You can force a trailing whitespace behind a tag by adding `>`. 
 
 ~~~ slim
 a#closed> class="test" /
 a#closed> class="test"/
 a> href='url1' Link1
 a< href='url1' Link1
-a' href='url2' Link2
 ~~~
 
 renders as
 
 ~~~ html
-<a class="test" id="closed" /> <a class="test" id="closed" /> <a href="url1">Link1</a>  <a href="url1">Link1</a><a href="url2">Link2</a> 
+<a class="test" id="closed" /> <a class="test" id="closed" /> <a href="url1">Link1</a>  <a href="url1">Link1</a>
 ~~~
 
-If you combine > and =' only one trailing whitespace is added.
+If you combine > and => only one trailing whitespace is added.
 
 ~~~ slim
-a> =' 'Text1'
-a =' 'Text2'
+a> => 'Text1'
+a => 'Text2'
 a> = 'Text3'
 a>= 'Text4'
 a=> 'Text5'

data/test/sinatra/contest.rb

@@ -0,0 +1,91 @@
+# Copyright (c) 2009 Damian Janowski and Michel Martens for Citrusbyte
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+require "rubygems"
+require "minitest/autorun"
+
+# Contest adds +teardown+, +test+ and +context+ as class methods, and the
+# instance methods +setup+ and +teardown+ now iterate on the corresponding
+# blocks. Note that all setup and teardown blocks must be defined with the
+# block syntax. Adding setup or teardown instance methods defeats the purpose
+# of this library.
+class Minitest::Test
+  def self.setup(&block)     setup_blocks    << block  end
+  def self.teardown(&block)  teardown_blocks << block  end
+  def self.setup_blocks()    @setup_blocks    ||= []   end
+  def self.teardown_blocks() @teardown_blocks ||= []   end
+
+  def setup_blocks(base = self.class)
+    setup_blocks base.superclass if base.superclass.respond_to? :setup_blocks
+    base.setup_blocks.each do |block|
+      instance_eval(&block)
+    end
+  end
+
+  def teardown_blocks(base = self.class)
+    teardown_blocks base.superclass if base.superclass.respond_to? :teardown_blocks
+    base.teardown_blocks.each do |block|
+      instance_eval(&block)
+    end
+  end
+
+  alias setup setup_blocks
+  alias teardown teardown_blocks
+
+  def self.context(*name, &block)
+    subclass = Class.new(self)
+    remove_tests(subclass)
+    subclass.class_eval(&block) if block_given?
+    const_set(context_name(name.join(" ")), subclass)
+  end
+
+  def self.test(name, &block)
+    define_method(test_name(name), &block)
+  end
+
+  class << self
+    alias_method :should, :test
+    alias_method :describe, :context
+  end
+
+private
+
+  def self.context_name(name)
+    # "Test#{sanitize_name(name).gsub(/(^| )(\w)/) { $2.upcase }}".to_sym
+    name = "Test#{sanitize_name(name).gsub(/(^| )(\w)/) { $2.upcase }}"
+    name.tr(" ", "_").to_sym
+  end
+
+  def self.test_name(name)
+    name = "test_#{sanitize_name(name).gsub(/\s+/,'_')}_0"
+    name = name.succ while method_defined? name
+    name.to_sym
+  end
+
+  def self.sanitize_name(name)
+    # name.gsub(/\W+/, ' ').strip
+    name.gsub(/\W+/, ' ')
+  end
+
+  def self.remove_tests(subclass)
+    subclass.public_instance_methods.grep(/^test_/).each do |meth|
+      subclass.send(:undef_method, meth.to_sym)
+    end
+  end
+end

data/test/sinatra/helper.rb

@@ -0,0 +1,145 @@
+if ENV['COVERAGE']
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter '/test/'
+    add_group 'sinatra-contrib', 'sinatra-contrib'
+    add_group 'rack-protection', 'rack-protection'
+  end
+end
+
+ENV['APP_ENV'] = 'test'
+Encoding.default_external = "UTF-8" if defined? Encoding
+
+RUBY_ENGINE = 'ruby' unless defined? RUBY_ENGINE
+
+require 'rack'
+
+testdir = File.dirname(__FILE__)
+$LOAD_PATH.unshift testdir unless $LOAD_PATH.include?(testdir)
+
+libdir = File.dirname(File.dirname(__FILE__)) + '/lib'
+$LOAD_PATH.unshift libdir unless $LOAD_PATH.include?(libdir)
+
+require 'minitest'
+require 'contest'
+require 'rack/test'
+require 'sinatra'
+require 'sinatra/base'
+
+class Sinatra::Base
+  include Minitest::Assertions
+  # Allow assertions in request context
+  def assertions
+    @assertions ||= 0
+  end
+
+  attr_writer :assertions
+end
+
+class Rack::Builder
+  def include?(middleware)
+    @ins.any? { |m| middleware === m }
+  end
+end
+
+Sinatra::Base.set :environment, :test
+
+class Minitest::Test
+  include Rack::Test::Methods
+
+  class << self
+    alias_method :it, :test
+    alias_method :section, :context
+  end
+
+  def self.example(desc = nil, &block)
+    @example_count = 0 unless instance_variable_defined? :@example_count
+    @example_count += 1
+    it(desc || "Example #{@example_count}", &block)
+  end
+
+  alias_method :response, :last_response
+
+  setup do
+    Sinatra::Base.set :environment, :test
+  end
+
+  # Sets up a Sinatra::Base subclass defined with the block
+  # given. Used in setup or individual spec methods to establish
+  # the application.
+  def mock_app(base=Sinatra::Base, &block)
+    @app = Sinatra.new(base, &block)
+  end
+
+  def app
+    Rack::Lint.new(@app)
+  end
+
+  def slim_app(&block)
+    mock_app do
+      set :views, File.dirname(__FILE__) + '/views'
+      get('/', &block)
+    end
+    get '/'
+  end
+
+  def body
+    response.body.to_s
+  end
+
+  def assert_body(value)
+    if value.respond_to? :to_str
+      assert_equal value.lstrip.gsub(/\s*\n\s*/, ""), body.lstrip.gsub(/\s*\n\s*/, "")
+    else
+      assert_match value, body
+    end
+  end
+
+  def assert_status(expected)
+    assert_equal Integer(expected), Integer(status)
+  end
+
+  def assert_like(a,b)
+    pattern = /id=['"][^"']*["']|\s+/
+    assert_equal a.strip.gsub(pattern, ""), b.strip.gsub(pattern, "")
+  end
+
+  def assert_include(str, substr)
+    assert str.include?(substr), "expected #{str.inspect} to include #{substr.inspect}"
+  end
+
+  def options(uri, params = {}, env = {}, &block)
+    request(uri, env.merge(:method => "OPTIONS", :params => params), &block)
+  end
+
+  def patch(uri, params = {}, env = {}, &block)
+    request(uri, env.merge(:method => "PATCH", :params => params), &block)
+  end
+
+  def link(uri, params = {}, env = {}, &block)
+    request(uri, env.merge(:method => "LINK", :params => params), &block)
+  end
+
+  def unlink(uri, params = {}, env = {}, &block)
+    request(uri, env.merge(:method => "UNLINK", :params => params), &block)
+  end
+
+  # Delegate other missing methods to response.
+  def method_missing(name, *args, &block)
+    if response && response.respond_to?(name)
+      response.send(name, *args, &block)
+    else
+      super
+    end
+  rescue Rack::Test::Error
+    super
+  end
+
+  # Do not output warnings for the duration of the block.
+  def silence_warnings
+    $VERBOSE, v = nil, $VERBOSE
+    yield
+  ensure
+    $VERBOSE = v
+  end
+end

data/test/sinatra/test_core.rb

@@ -0,0 +1,91 @@
+require_relative 'helper.rb'
+
+begin
+  class SlimTest < Minitest::Test
+    it 'renders inline slim strings' do
+      slim_app { slim "h1 Hiya\n" }
+      assert ok?
+      assert_equal "<h1>Hiya</h1>", body
+    end
+
+    it 'renders .slim files in views path' do
+      slim_app { slim :hello }
+      assert ok?
+      assert_equal "<h1>Hello From Slim</h1>", body
+    end
+
+    it "renders with inline layouts" do
+      mock_app do
+        layout { %(h1\n  | THIS. IS. \n  == yield.upcase ) }
+        get('/') { slim 'em Sparta' }
+      end
+      get '/'
+      assert ok?
+      assert_equal "<h1>THIS. IS. <EM>SPARTA</EM></h1>", body
+    end
+
+    it "renders with file layouts" do
+      slim_app { slim('| Hello World', :layout => :layout2) }
+      assert ok?
+      assert_equal "<h1>Slim Layout!</h1><p>Hello World</p>", body
+    end
+
+    it "raises error if template not found" do
+      mock_app { get('/') { slim(:no_such_template) } }
+      assert_raises(Errno::ENOENT) { get('/') }
+    end
+
+    HTML4_DOCTYPE = "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">"
+
+    it "passes slim options to the slim engine" do
+      mock_app { get('/') { slim("x foo='bar'", :attr_quote => "'") }}
+      get '/'
+      assert ok?
+      assert_body "<x foo='bar'></x>"
+    end
+
+    it "passes default slim options to the slim engine" do
+      mock_app do
+        set :slim, :attr_quote => "'"
+        get('/') { slim("x foo='bar'") }
+      end
+      get '/'
+      assert ok?
+      assert_body "<x foo='bar'></x>"
+    end
+
+    it "merges the default slim options with the overrides and passes them to the slim engine" do
+      mock_app do
+        set :slim, :attr_quote => "'"
+        get('/') { slim("x foo='bar'") }
+        get('/other') { slim("x foo='bar'", :attr_quote => '"') }
+      end
+      get '/'
+      assert ok?
+      assert_body "<x foo='bar'></x>"
+      get '/other'
+      assert ok?
+      assert_body '<x foo="bar"></x>'
+    end
+
+    it "can render truly nested layouts by accepting a layout and a block with the contents" do
+      mock_app do
+        template(:main_outer_layout) { "h1 Title\n== yield" }
+        template(:an_inner_layout) { "h2 Subtitle\n== yield" }
+        template(:a_page) { "p Contents." }
+        get('/') do
+          slim :main_outer_layout, :layout => false do
+            slim :an_inner_layout do
+              slim :a_page
+            end
+          end
+        end
+      end
+      get '/'
+      assert ok?
+      assert_body "<h1>Title</h1>\n<h2>Subtitle</h2>\n<p>Contents.</p>\n"
+    end
+  end
+rescue LoadError
+  warn "#{$!}: skipping slim tests"
+end

data/test/sinatra/test_include.rb

@@ -0,0 +1,16 @@
+require 'slim/include'
+
+require_relative 'helper.rb'
+
+begin
+  class SlimTest < Minitest::Test
+    it 'renders .slim files includes with js embed' do
+      slim_app { slim :embed_include_js }
+      assert ok?
+      assert_equal "<!DOCTYPE html><html><head><title>Slim Examples</title><script>alert('Slim supports embedded javascript!')</script></head><body><footer>Slim</footer></body></html>", body
+    end
+
+  end
+rescue LoadError
+  warn "#{$!}: skipping slim tests"
+end

data/test/sinatra/views/embed_include_js.slim

@@ -0,0 +1,8 @@
+doctype html
+html
+  head
+    title Slim Examples
+    javascript:
+      alert('Slim supports embedded javascript!')
+  body
+    include footer.slim

data/test/sinatra/views/embed_js.slim

@@ -0,0 +1,11 @@
+doctype html
+html
+  head
+    title Slim Examples
+    javascript:
+      alert('Slim supports embedded javascript!')
+  body
+    h1 Markup examples
+
+    #content
+      p This example shows you how a basic Slim file looks.

data/test/sinatra/views/footer.slim

@@ -0,0 +1 @@
+footer Slim

data/test/sinatra/views/hello.slim

@@ -0,0 +1 @@
+h1 Hello From Slim

data/test/sinatra/views/layout2.slim

@@ -0,0 +1,3 @@
+h1 Slim Layout!
+p
+  == yield

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Daniel Mendler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2018-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -183,6 +183,15 @@ files:
 - test/rails/script/rails
 - test/rails/test/helper.rb
 - test/rails/test/test_slim.rb
+- test/sinatra/contest.rb
+- test/sinatra/helper.rb
+- test/sinatra/test_core.rb
+- test/sinatra/test_include.rb
+- test/sinatra/views/embed_include_js.slim
+- test/sinatra/views/embed_js.slim
+- test/sinatra/views/footer.slim
+- test/sinatra/views/hello.slim
+- test/sinatra/views/layout2.slim
 - test/smart/test_smart_text.rb
 - test/translator/test_translator.rb
 homepage: http://slim-lang.com/