brakeman 3.3.0 → 3.3.1

data/bundle/ruby/2.3.0/gems/{slim-3.0.6 → slim-3.0.7}/doc/logic_less.md

@@ -55,7 +55,7 @@ The dictionary object is accessed in the order given by the `:dictionary_access`
 
 If all the above fails, Slim will try to resolve the title reference in the same order against the parent object. In this example, the parent would be the dictionary object you are rendering the template against.
 
-As you might have guessed, the article reference goes through the same steps against the dictionary. Instance variables are not allowed in the view code, but Slim will find and use them. Essentially, you're just using dropping the @ prefix in your template. Parameterized method calls are not allowed.
+As you might have guessed, the article reference goes through the same steps against the dictionary. Instance variables are not allowed in the view code, but Slim will find and use them. Essentially, you're just dropping the @ prefix in your template. Parameterized method calls are not allowed.
 
 
 ## Strings

data/bundle/ruby/2.3.0/gems/{slim-3.0.6 → slim-3.0.7}/lib/slim/end_inserter.rb

@@ -10,7 +10,7 @@ module Slim
   #
   # @api private
   class EndInserter < Filter
-    IF_RE = /\A(if|unless|else|elsif|when|rescue|ensure)\b|\bdo\s*(\|[^\|]*\|)?\s*$/
+    IF_RE = /\A(if|begin|unless|else|elsif|when|rescue|ensure)\b|\bdo\s*(\|[^\|]*\|)?\s*$/
     ELSE_RE = /\A(else|elsif|when|rescue|ensure)\b/
     END_RE = /\Aend\b/
 

data/bundle/ruby/2.3.0/gems/{slim-3.0.6 → slim-3.0.7}/lib/slim/engine.rb

@@ -34,8 +34,6 @@ module Slim
     filter :ControlFlow
     filter :MultiFlattener
     filter :StaticMerger
-    use :Generator do
-      options[:generator].new(options.to_hash.reject {|k,v| !options[:generator].options.valid_key?(k) })
-    end
+    use(:Generator) { options[:generator] }
   end
 end

data/bundle/ruby/2.3.0/gems/{slim-3.0.6 → slim-3.0.7}/lib/slim/parser.rb

@@ -55,13 +55,18 @@ module Slim
         @tab_re = "\t"
         @tab = ' '
       end
-      @tag_shortcut, @attr_shortcut = {}, {}
+      @tag_shortcut, @attr_shortcut, @additional_attrs = {}, {}, {}
       options[:shortcut].each do |k,v|
-        raise ArgumentError, 'Shortcut requires :tag and/or :attr' unless (v[:attr] || v[:tag]) && (v.keys - [:attr, :tag]).empty?
+        raise ArgumentError, 'Shortcut requires :tag and/or :attr' unless (v[:attr] || v[:tag]) && (v.keys - [:attr, :tag, :additional_attrs]).empty?
         @tag_shortcut[k] = v[:tag] || options[:default_tag]
+        if v.include?(:attr) || v.include?(:additional_attrs)
+          raise ArgumentError, 'You can only use special characters for attribute shortcuts' if k =~ /(\p{Word}|-)/
+        end
         if v.include?(:attr)
           @attr_shortcut[k] = [v[:attr]].flatten
-          raise ArgumentError, 'You can only use special characters for attribute shortcuts' if k =~ /(\p{Word}|-)/
+        end
+        if v.include?(:additional_attrs)
+          @additional_attrs[k] = v[:additional_attrs]
         end
       end
       keys = Regexp.union @attr_shortcut.keys.sort_by {|k| -k.size }
@@ -221,13 +226,13 @@ module Slim
         # Found an output block.
         # We expect the line to be broken or the next line to be indented.
         @line = $'
-        trailing_ws = $2.include?('>')
-        if $2.include?('\'')
+        trailing_ws = $2.include?('>'.freeze)
+        if $2.include?('\''.freeze)
           deprecated_syntax '=\' for trailing whitespace is deprecated in favor of =>'
           trailing_ws = true
         end
         block = [:multi]
-        @stacks.last << [:static, ' '] if $2.include?('<')
+        @stacks.last << [:static, ' '] if $2.include?('<'.freeze)
         @stacks.last << [:slim, :output, $1.empty?, parse_broken_line, block]
         @stacks.last << [:static, ' '] if trailing_ws
         @stacks << block
@@ -326,18 +331,23 @@ module Slim
         # because we don't want text interpolation in .class or #id shortcut
         syntax_error!('Illegal shortcut') unless shortcut = @attr_shortcut[$1]
         shortcut.each {|a| attributes << [:html, :attr, a, [:static, $2]] }
+        if additional_attr_pairs = @additional_attrs[$1]
+          additional_attr_pairs.each do |k,v|
+            attributes << [:html, :attr, k.to_s, [:static, v]]
+          end
+        end
         @line = $'
       end
 
       @line =~ /\A[<>']*/
       @line = $'
-      trailing_ws = $&.include?('>')
-      if $&.include?('\'')
+      trailing_ws = $&.include?('>'.freeze)
+      if $&.include?('\''.freeze)
         deprecated_syntax 'tag\' for trailing whitespace is deprecated in favor of tag>'
         trailing_ws = true
       end
 
-      leading_ws = $&.include?('<')
+      leading_ws = $&.include?('<'.freeze)
 
       parse_attributes(attributes)
 
@@ -366,13 +376,13 @@ module Slim
       when /\A\s*=(=?)(['<>]*)/
         # Handle output code
         @line = $'
-        trailing_ws2 = $2.include?('>')
-        if $2.include?('\'')
+        trailing_ws2 = $2.include?('>'.freeze)
+        if $2.include?('\''.freeze)
           deprecated_syntax '=\' for trailing whitespace is deprecated in favor of =>'
           trailing_ws2 = true
         end
         block = [:multi]
-        @stacks.last.insert(-2, [:static, ' ']) if !leading_ws && $2.include?('<')
+        @stacks.last.insert(-2, [:static, ' ']) if !leading_ws && $2.include?('<'.freeze)
         tag << [:slim, :output, $1 != '=', parse_broken_line, block]
         @stacks.last << [:static, ' '] if !trailing_ws && trailing_ws2
         @stacks << block

data/bundle/ruby/2.3.0/gems/{slim-3.0.6 → slim-3.0.7}/lib/slim/smart/escaper.rb

@@ -24,7 +24,7 @@ module Slim
         block = [:multi]
         until string.empty?
           case string
-          when /\A&(\w+|#x[0-9a-f]+|#\d+);/i
+          when /\A&([a-z][a-z0-9]*|#x[0-9a-f]+|#\d+);/i
             # Entity.
             block << [:escape, false, [:static, $&]]
             string = $'

data/bundle/ruby/2.3.0/gems/{slim-3.0.6 → slim-3.0.7}/lib/slim/version.rb

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

data/bundle/ruby/2.3.0/gems/{slim-3.0.6 → slim-3.0.7}/slim.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>=1.9.2'
 
-  s.add_runtime_dependency('temple', ['~> 0.7.3'])
+  s.add_runtime_dependency('temple', ['~> 0.7.6'])
   s.add_runtime_dependency('tilt', ['>= 1.3.3', '< 2.1'])
 end

data/bundle/ruby/2.3.0/gems/{slim-3.0.6 → slim-3.0.7}/test/core/test_code_structure.rb

@@ -13,6 +13,24 @@ div
     assert_html '<div><p>The second paragraph</p></div>', source
   end
 
+  def test_render_with_begin
+    source = %q{
+- if true
+  - begin
+    p A
+- if true
+  - begin
+    p B
+- if true
+  - begin
+    p C
+  - rescue
+    p D
+}
+
+    assert_html '<p>A</p><p>B</p><p>C</p>', source
+  end
+
   def test_render_with_consecutive_conditionals
     source = %q{
 div

data/bundle/ruby/2.3.0/gems/{slim-3.0.6 → slim-3.0.7}/test/core/test_html_structure.rb

@@ -99,6 +99,22 @@ h1#title This is my title
     assert_html '<div class="hello world" id="notice" role="test">Hello World from @env</div><section role="abc">Hello World from @env</section>', source, shortcut: {'#' => {attr: 'id'}, '.' => {attr: 'class'}, '@' => {tag: 'section', attr: 'role'}}
   end
 
+  def test_render_with_custom_array_shortcut
+    source = %q{
+#user@.admin Daniel
+}
+    assert_html '<div class="admin" id="user" role="admin">Daniel</div>', source, shortcut: {'#' => {attr: 'id'}, '.' => {attr: 'class'}, '@' => {attr: 'role'}, '@.' => {attr: ['class', 'role']}}
+  end
+
+  def test_render_with_custom_shortcut_and_additional_attrs
+    source = %q{
+^items
+  == "[{'title':'item0'},{'title':'item1'},{'title':'item2'},{'title':'item3'},{'title':'item4'}]"
+}
+    assert_html '<script data-binding="items" type="application/json">[{\'title\':\'item0\'},{\'title\':\'item1\'},{\'title\':\'item2\'},{\'title\':\'item3\'},{\'title\':\'item4\'}]</script>',
+                source, shortcut: {'^' => {tag: 'script', attr: 'data-binding', additional_attrs: { type: "application/json" }}}
+  end
+
   def test_render_with_text_block
     source = %q{
 p

data/bundle/ruby/2.3.0/gems/{slim-3.0.6 → slim-3.0.7}/test/smart/test_smart_text.rb

@@ -99,14 +99,14 @@ p
   > Escaped <&>.
   Protected &amp; &lt; &gt; &copy; &Aacute;.
   Protected &#0129; &#x00ff;.
-  Escaped &#xx; &#1f; &;.
+  Escaped &#xx; &#1f; &9; &_; &;.
 }
 
     result = %q{Not escaped <&>.<p>Escaped &lt;&amp;&gt;.</p><p>Escaped &lt;&amp;&gt;.
 Escaped &lt;&amp;&gt;.
 Protected &amp; &lt; &gt; &copy; &Aacute;.
 Protected &#0129; &#x00ff;.
-Escaped &amp;#xx; &amp;#1f; &amp;;.</p>}
+Escaped &amp;#xx; &amp;#1f; &amp;9; &amp;_; &amp;;.</p>}
 
     assert_html result, source
   end
@@ -121,14 +121,14 @@ p
   > Not escaped <&>.
   Not escaped &amp; &lt; &gt; &copy; &Aacute;.
   Not escaped &#0129; &#x00ff;.
-  Not escaped &#xx; &#1f; &;.
+  Not escaped &#xx; &#1f; &9; &_; &;.
 }
 
     result = %q{<p>Not escaped <&>.</p>Not escaped <&>.<p>Not escaped <&>.
 Not escaped <&>.
 Not escaped &amp; &lt; &gt; &copy; &Aacute;.
 Not escaped &#0129; &#x00ff;.
-Not escaped &#xx; &#1f; &;.</p>}
+Not escaped &#xx; &#1f; &9; &_; &;.</p>}
 
       assert_html result, source
     end
@@ -139,13 +139,13 @@ Not escaped &#xx; &#1f; &;.</p>}
 p Escaped <&>.
   Protected &amp; &lt; &gt; &copy; &Aacute;.
   Protected &#0129; &#x00ff;.
-  Escaped &#xx; &#1f; &;.
+  Escaped &#xx; &#1f; &9; &_; &;.
 }
 
     result = %q{<p>Escaped &lt;&amp;&gt;.
 Protected &amp; &lt; &gt; &copy; &Aacute;.
 Protected &#0129; &#x00ff;.
-Escaped &amp;#xx; &amp;#1f; &amp;;.</p>}
+Escaped &amp;#xx; &amp;#1f; &amp;9; &amp;_; &amp;;.</p>}
 
     assert_html result, source
   end