brakeman 3.4.1 → 3.5.0

data/bundle/ruby/2.3.0/gems/{sass-3.4.22 → sass-3.4.23}/lib/sass/script/functions.rb

@@ -1305,7 +1305,7 @@ module Sass::Script
     #   @param $color1 [Sass::Script::Value::Color]
     #   @param $color2 [Sass::Script::Value::Color]
     #   @param $weight [Sass::Script::Value::Number] The relative weight of each
-    #     color. Closer to `0%` gives more weight to `$color1`, closer to `100%`
+    #     color. Closer to `100%` gives more weight to `$color1`, closer to `0%`
     #     gives more weight to `$color2`
     # @return [Sass::Script::Value::Color]
     # @raise [ArgumentError] if `$weight` is out of bounds or any parameter is
@@ -1546,7 +1546,7 @@ MESSAGE
     #   @param $start-at [Sass::Script::Value::Number] The index of the first
     #     character of the substring. If this is negative, it counts from the end
     #     of `$string`
-    #   @param $end-before [Sass::Script::Value::Number] The index of the last
+    #   @param $end-at [Sass::Script::Value::Number] The index of the last
     #     character of the substring. If this is negative, it counts from the end
     #     of `$string`. Defaults to -1
     #   @return [Sass::Script::Value::String] The substring. This will be quoted
@@ -1565,7 +1565,7 @@ MESSAGE
       s = string.value.length + s if s < 0
       s = 0 if s < 0
       e = string.value.length + e if e < 0
-      e = 0 if s < 0
+      return Sass::Script::Value::String.new("", string.type) if e < 0
       extracted = string.value.slice(s..e)
       Sass::Script::Value::String.new(extracted || "", string.type)
     end
@@ -1611,6 +1611,7 @@ MESSAGE
     #   type-of(true)   => bool
     #   type-of(#fff)   => color
     #   type-of(blue)   => color
+    #   type-of(null)   => null
     # @overload type_of($value)
     #   @param $value [Sass::Script::Value::Base] The value to inspect
     # @return [Sass::Script::Value::String] The unquoted string name of the
@@ -2263,6 +2264,7 @@ MESSAGE
     # @example
     #   $a-false-value: false;
     #   variable-exists(a-false-value) => true
+    #   variable-exists(a-null-value) => true
     #
     #   variable-exists(nonexistent) => false
     #
@@ -2283,6 +2285,7 @@ MESSAGE
     # @example
     #   $a-false-value: false;
     #   global-variable-exists(a-false-value) => true
+    #   global-variable-exists(a-null-value) => true
     #
     #   .foo {
     #     $some-var: false;

data/bundle/ruby/2.3.0/gems/{sass-3.4.22 → sass-3.4.23}/lib/sass/script/parser.rb

@@ -471,18 +471,24 @@ RUBY
       #   `expr`).
       # @return [Boolean]
       def is_unsafe_before?(expr, char_before)
-        # If the previous expression is an identifier or number, it's safe
-        # unless it was wrapped in parentheses.
-        if expr.is_a?(Script::Tree::Literal) &&
-           (expr.value.is_a?(Script::Value::Number) ||
-            (expr.value.is_a?(Script::Value::String) && expr.value.type == :identifier))
-          return char_before == ')'
-        end
+        return char_before == ')' if is_safe_value?(expr)
 
         # Otherwise, it's only safe if it was another interpolation.
         !expr.is_a?(Script::Tree::Interpolation)
       end
 
+      # Returns whether `expr` is safe as the value immediately before an
+      # interpolation.
+      #
+      # It's safe as long as the previous expression is an identifier or number,
+      # or a list whose last element is also safe.
+      def is_safe_value?(expr)
+        return is_safe_value?(expr.elements.last) if expr.is_a?(Script::Tree::ListLiteral)
+        return false unless expr.is_a?(Script::Tree::Literal)
+        expr.value.is_a?(Script::Value::Number) ||
+          (expr.value.is_a?(Script::Value::String) && expr.value.type == :identifier)
+      end
+
       def space
         start_pos = source_position
         e = or_expr

data/bundle/ruby/2.3.0/gems/{sass-3.4.22 → sass-3.4.23}/lib/sass/script/value/number.rb

@@ -34,29 +34,31 @@ module Sass::Script::Value
     attr_accessor :original
 
     def self.precision
-      @precision ||= 5
+      Thread.current[:sass_numeric_precision] || Thread.main[:sass_numeric_precision] || 5
     end
 
     # Sets the number of digits of precision
     # For example, if this is `3`,
     # `3.1415926` will be printed as `3.142`.
+    # The numeric precision is stored as a thread local for thread safety reasons.
+    # To set for all threads, be sure to set the precision on the main thread.
     def self.precision=(digits)
-      @precision = digits.round
-      @precision_factor = 10.0**@precision
-      @epsilon = 1 / (@precision_factor * 10)
+      Thread.current[:sass_numeric_precision] = digits.round
+      Thread.current[:sass_numeric_precision_factor] = nil
+      Thread.current[:sass_numeric_epsilon] = nil
     end
 
     # the precision factor used in numeric output
     # it is derived from the `precision` method.
     def self.precision_factor
-      @precision_factor ||= 10.0**precision
+      Thread.current[:sass_numeric_precision_factor] ||= 10.0**precision
     end
 
     # Used in checking equality of floating point numbers. Any
     # numbers within an `epsilon` of each other are considered functionally equal.
     # The value for epsilon is one tenth of the current numeric precision.
     def self.epsilon
-      @epsilon ||= 1 / (precision_factor * 10)
+      Thread.current[:sass_numeric_epsilon] ||= 1 / (precision_factor * 10)
     end
 
     # Used so we don't allocate two new arrays for each new number.
@@ -508,8 +510,8 @@ module Sass::Script::Value
       },
       {
         'dpi'  => Rational(1),
-        'dpcm' => Rational(1, 2.54),
-        'dppx' => Rational(1, 96)
+        'dpcm' => Rational(254, 100),
+        'dppx' => Rational(96)
       }
     ]
 

data/bundle/ruby/2.3.0/gems/{sass-3.4.22 → sass-3.4.23}/lib/sass/scss/parser.rb

@@ -560,7 +560,7 @@ module Sass
       def supports_clause
         return unless tok(/supports\(/i)
         ss
-        supports = supports_condition
+        supports = import_supports_condition
         ss
         tok!(/\)/)
         supports
@@ -570,6 +570,10 @@ module Sass
         supports_negation || supports_operator || supports_interpolation
       end
 
+      def import_supports_condition
+        supports_condition || supports_declaration
+      end
+
       def supports_negation
         return unless tok(/not/i)
         ss
@@ -589,6 +593,13 @@ module Sass
         cond
       end
 
+      def supports_declaration
+          name = sass_script(:parse)
+          tok!(/:/); ss
+          value = sass_script(:parse)
+          Sass::Supports::Declaration.new(name, value)
+      end
+
       def supports_condition_in_parens
         interp = supports_interpolation
         return interp if interp
@@ -597,11 +608,9 @@ module Sass
           tok!(/\)/); ss
           cond
         else
-          name = sass_script(:parse)
-          tok!(/:/); ss
-          value = sass_script(:parse)
+          decl = supports_declaration
           tok!(/\)/); ss
-          Sass::Supports::Declaration.new(name, value)
+          decl
         end
       end
 
@@ -828,6 +837,9 @@ module Sass
           |
             (?!url\()
             [^"'/\#!;\{\}] # "
+          |
+            # interp_uri will handle most url() calls, but not ones that take strings
+            url\(#{W}(?=")
           |
             /(?![/*])
           |
@@ -1143,14 +1155,20 @@ WARNING
         line = @line
         offset = @offset
         expected = @expected
+
+        logger = Sass::Logger::Delayed.install!
         if catch(:_sass_parser_error) {yield; false}
           @scanner.pos = pos
           @line = line
           @offset = offset
           @expected = expected
           {:pos => pos, :line => line, :expected => @expected, :block => block}
+        else
+          logger.flush
+          nil
         end
       ensure
+        logger.uninstall! if logger
         @throw_error = old_throw_error
       end
 

data/bundle/ruby/2.3.0/gems/{sass-3.4.22 → sass-3.4.23}/lib/sass/source/map.rb

@@ -118,12 +118,14 @@ module Sass::Source
       @data.each do |m|
         file, importer = m.input.file, m.input.importer
 
+        next unless importer
+
         if options[:type] == :inline
           source_uri = file
         else
           sourcemap_dir = sourcemap_path && sourcemap_path.dirname.to_s
           sourcemap_dir = nil if options[:type] == :file
-          source_uri = importer && importer.public_url(file, sourcemap_dir)
+          source_uri = importer.public_url(file, sourcemap_dir)
           next unless source_uri
         end
 

data/bundle/ruby/2.3.0/gems/{sass-3.4.22 → sass-3.4.23}/lib/sass/tree/visitors/convert.rb

@@ -289,7 +289,9 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
               child.line + 1 == nxt.line) ||
             (child.is_a?(Sass::Tree::VariableNode) && nxt.is_a?(Sass::Tree::VariableNode) &&
               child.line + 1 == nxt.line) ||
-            (child.is_a?(Sass::Tree::PropNode) && nxt.is_a?(Sass::Tree::PropNode))
+            (child.is_a?(Sass::Tree::PropNode) && nxt.is_a?(Sass::Tree::PropNode)) ||
+            (child.is_a?(Sass::Tree::MixinNode) && nxt.is_a?(Sass::Tree::MixinNode) &&
+              child.line + 1 == nxt.line)
           ""
         else
           "\n"