brakeman 3.6.1 → 3.6.2

data/bundle/ruby/2.3.0/gems/{ruby_parser-3.8.4 → ruby_parser-3.9.0}/lib/ruby24_parser.y

@@ -983,9 +983,13 @@ rule
                       result = val[1] || s(:array)
                       result[0] = :array # aref_args is :args
                     }
-                | tLBRACE assoc_list tRCURLY
+                | tLBRACE
                     {
-                      result = s(:hash, *val[1].values) # TODO: array_to_hash?
+                      result = self.lexer.lineno
+                    }
+                    assoc_list tRCURLY
+                    {
+                      result = new_hash val
                     }
                 | kRETURN
                     {
@@ -2304,7 +2308,6 @@ keyword_variable: kNIL      { result = s(:nil)   }
                       list.push(*more) unless more.empty?
                       result = list
                       result[0] = :hash
-                      # TODO: shouldn't this be a hash?
                     }
 
            assoc: arg_value tASSOC arg_value

data/bundle/ruby/2.3.0/gems/{ruby_parser-3.8.4 → ruby_parser-3.9.0}/lib/ruby_lexer.rex.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 #--
 # This file is automatically generated. Do not modify it.
-# Generated by: oedipus_lex version 2.4.1.
+# Generated by: oedipus_lex version 2.5.0.
 # Source: lib/ruby_lexer.rex
 #++
 
@@ -25,7 +25,8 @@ class RubyLexer
   INT_OCT_BAD   = /[+]?0o?[0-7_]*[89]/i
   FLOAT_BAD     = /[+]?\d[\d_]*_(e|\.)/i
 
-  class ScanError < StandardError ; end
+  class LexerError < StandardError ; end
+  class ScanError < LexerError ; end
 
   attr_accessor :filename
   attr_accessor :ss
@@ -43,7 +44,6 @@ class RubyLexer
     yield
   end
 
-
   def scanner_class
     StringScanner
   end unless instance_methods(false).map(&:to_s).include?("scanner_class")
@@ -62,6 +62,12 @@ class RubyLexer
     end
   end
 
+  def location
+    [
+      (filename || "<input>"),
+    ].compact.join(":")
+  end
+
   def next_token
     return process_string if lex_strterm
     self.command_state = self.command_start
@@ -297,16 +303,16 @@ class RubyLexer
             action { rb_compile_error "Invalid char #{text.inspect} in expression" }
           else
             text = ss.string[ss.pos .. -1]
-            raise ScanError, "can not match (#{state.inspect}): '#{text}'"
+            raise ScanError, "can not match (#{state.inspect}) at #{location}: '#{text}'"
           end
         else
-          raise ScanError, "undefined state: '#{state}'"
+          raise ScanError, "undefined state at #{location}: '#{state}'"
         end # token = case state
 
       next unless token # allow functions to trigger redo w/ nil
     end # while
 
-    raise "bad lexical result: #{token.inspect}" unless
+    raise LexerError, "bad lexical result at #{location}: #{token.inspect}" unless
       token.nil? || (Array === token && token.size >= 2)
 
     # auto-switch state

data/bundle/ruby/2.3.0/gems/{ruby_parser-3.8.4 → ruby_parser-3.9.0}/lib/ruby_parser.yy

@@ -1026,9 +1026,13 @@ rule
                       result = val[1] || s(:array)
                       result[0] = :array # aref_args is :args
                     }
-                | tLBRACE assoc_list tRCURLY
+                | tLBRACE
                     {
-                      result = s(:hash, *val[1].values) # TODO: array_to_hash?
+                      result = self.lexer.lineno
+                    }
+                    assoc_list tRCURLY
+                    {
+                      result = new_hash val
                     }
                 | kRETURN
                     {
@@ -2397,7 +2401,6 @@ keyword_variable: kNIL      { result = s(:nil)   }
                       list.push(*more) unless more.empty?
                       result = list
                       result[0] = :hash
-                      # TODO: shouldn't this be a hash?
                     }
 
            assoc: arg_value tASSOC arg_value

data/bundle/ruby/2.3.0/gems/{ruby_parser-3.8.4 → ruby_parser-3.9.0}/lib/ruby_parser_extras.rb

@@ -7,7 +7,7 @@ require "rp_extensions"
 require "rp_stringscanner"
 
 module RubyParserStuff
-  VERSION = "3.8.4"
+  VERSION = "3.9.0"
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_reader :env, :comments
@@ -620,6 +620,10 @@ module RubyParserStuff
     result
   end
 
+  def new_hash val
+    s(:hash, *val[2].values).line(val[1])
+  end
+
   def new_if c, t, f
     l = [c.line, t && t.line, f && f.line].compact.min
     c = cond c

data/bundle/ruby/2.3.0/gems/{ruby_parser-3.8.4 → ruby_parser-3.9.0}/test/test_ruby_parser.rb

@@ -705,6 +705,15 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
+  def test_parse_line_hash_lit
+    rb = "{\n:s1 => 1,\n}"
+    pt = s(:hash,
+           s(:lit, :s1).line(2), s(:lit, 1).line(2),
+          ).line(1)
+
+    assert_parse rb, pt
+  end
+
   def test_parse_line_heredoc_evstr
     skip "heredoc line numbers are just gonna be screwed for a while..."
 

data/bundle/ruby/2.3.0/gems/sass-3.4.24/VERSION

@@ -0,0 +1 @@
+3.4.24

data/bundle/ruby/2.3.0/gems/sass-3.4.24/VERSION_DATE

@@ -0,0 +1 @@
+19 May 2017 00:01:41 UTC

data/bundle/ruby/2.3.0/gems/{sass-3.4.23 → sass-3.4.24}/lib/sass/engine.rb

@@ -94,13 +94,13 @@ module Sass
     # `text`: `String`
     # : The text in the line, without any whitespace at the beginning or end.
     #
-    # `tabs`: `Fixnum`
+    # `tabs`: `Integer`
     # : The level of indentation of the line.
     #
-    # `index`: `Fixnum`
+    # `index`: `Integer`
     # : The line number in the original document.
     #
-    # `offset`: `Fixnum`
+    # `offset`: `Integer`
     # : The number of bytes in on the line that the text begins.
     #   This ends up being the number of bytes of leading whitespace.
     #

data/bundle/ruby/2.3.0/gems/{sass-3.4.23 → sass-3.4.24}/lib/sass/error.rb

@@ -69,14 +69,14 @@ module Sass
     # The name of the mixin in which the error occurred.
     # This could be `nil` if the error occurred outside a mixin.
     #
-    # @return [Fixnum]
+    # @return [String]
     def sass_mixin
       sass_backtrace.first[:mixin]
     end
 
     # The line of the Sass template on which the error occurred.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     def sass_line
       sass_backtrace.first[:line]
     end
@@ -153,7 +153,7 @@ module Sass
       # Returns an error report for an exception in CSS format.
       #
       # @param e [Exception]
-      # @param line_offset [Fixnum] The number of the first line of the Sass template.
+      # @param line_offset [Integer] The number of the first line of the Sass template.
       # @return [String] The error report
       # @raise [Exception] `e`, if the
       #   {file:SASS_REFERENCE.md#full_exception-option `:full_exception`} option

data/bundle/ruby/2.3.0/gems/{sass-3.4.23 → sass-3.4.24}/lib/sass/plugin/rack.rb

@@ -9,7 +9,7 @@ module Sass
     #
     # ## Customize
     #
-    #     Sass::Plugin.options.merge(
+    #     Sass::Plugin.options.merge!(
     #       :cache_location => './tmp/sass-cache',
     #       :never_update => environment != :production,
     #       :full_exception => environment != :production)

data/bundle/ruby/2.3.0/gems/{sass-3.4.23 → sass-3.4.24}/lib/sass/plugin/staleness_checker.rb

@@ -72,7 +72,7 @@ module Sass
       # Returns whether a Sass or SCSS stylesheet has been modified since a given time.
       #
       # @param template_file [String] The location of the Sass or SCSS template.
-      # @param mtime [Fixnum] The modification time to check against.
+      # @param mtime [Time] The modification time to check against.
       # @param importer [Sass::Importers::Base] The importer used to locate the stylesheet.
       #   Defaults to the filesystem importer.
       # @return [Boolean] Whether the stylesheet has been modified.
@@ -103,7 +103,7 @@ module Sass
       # so it's better to use when checking multiple stylesheets at once.
       #
       # @param template_file [String] The location of the Sass or SCSS template.
-      # @param mtime [Fixnum] The modification time to check against.
+      # @param mtime [Time] The modification time to check against.
       # @param importer [Sass::Importers::Base] The importer used to locate the stylesheet.
       #   Defaults to the filesystem importer.
       # @return [Boolean] Whether the stylesheet has been modified.

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

@@ -16,9 +16,9 @@ module Sass
     # Parses a string of SassScript
     #
     # @param value [String] The SassScript
-    # @param line [Fixnum] The number of the line on which the SassScript appeared.
+    # @param line [Integer] The number of the line on which the SassScript appeared.
     #   Used for error reporting
-    # @param offset [Fixnum] The number of characters in on `line` that the SassScript started.
+    # @param offset [Integer] The number of characters in on `line` that the SassScript started.
     #   Used for error reporting
     # @param options [{Symbol => Object}] An options hash;
     #   see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}

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

@@ -431,8 +431,8 @@ module Sass::Script
     # If no signatures match, the first signature is returned for error messaging.
     #
     # @param method_name [Symbol] The name of the Ruby function to be called.
-    # @param arg_arity [Fixnum] The number of unnamed arguments the function was passed.
-    # @param kwarg_arity [Fixnum] The number of keyword arguments the function was passed.
+    # @param arg_arity [Integer] The number of unnamed arguments the function was passed.
+    # @param kwarg_arity [Integer] The number of keyword arguments the function was passed.
     #
     # @return [{Symbol => Object}, nil]
     #   The signature options for the matching signature,
@@ -1583,7 +1583,7 @@ MESSAGE
     # @raise [ArgumentError] if `$string` isn't a string
     def to_upper_case(string)
       assert_type string, :String, :string
-      Sass::Script::Value::String.new(string.value.upcase, string.type)
+      Sass::Script::Value::String.new(Sass::Util.upcase(string.value), string.type)
     end
     declare :to_upper_case, [:string]
 
@@ -1598,7 +1598,7 @@ MESSAGE
     # @raise [ArgumentError] if `$string` isn't a string
     def to_lower_case(string)
       assert_type string, :String, :string
-      Sass::Script::Value::String.new(string.value.downcase, string.type)
+      Sass::Script::Value::String.new(Sass::Util.downcase(string.value), string.type)
     end
     declare :to_lower_case, [:string]
 

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

@@ -19,13 +19,13 @@ module Sass
       # `source_range`: \[`Sass::Source::Range`\]
       # : The range in the source file in which the token appeared.
       #
-      # `pos`: \[`Fixnum`\]
+      # `pos`: \[`Integer`\]
       # : The scanner position at which the SassScript token appeared.
       Token = Struct.new(:type, :value, :source_range, :pos)
 
       # The line number of the lexer's current position.
       #
-      # @return [Fixnum]
+      # @return [Integer]
       def line
         return @line unless @tok
         @tok.source_range.start_pos.line
@@ -34,7 +34,7 @@ module Sass
       # The number of bytes into the current line
       # of the lexer's current position (1-based).
       #
-      # @return [Fixnum]
+      # @return [Integer]
       def offset
         return @offset unless @tok
         @tok.source_range.start_pos.offset
@@ -142,9 +142,9 @@ module Sass
       }
 
       # @param str [String, StringScanner] The source text to lex
-      # @param line [Fixnum] The 1-based line on which the SassScript appears.
+      # @param line [Integer] The 1-based line on which the SassScript appears.
       #   Used for error reporting and sourcemap building
-      # @param offset [Fixnum] The 1-based character (not byte) offset in the line in the source.
+      # @param offset [Integer] The 1-based character (not byte) offset in the line in the source.
       #   Used for error reporting and sourcemap building
       # @param options [{Symbol => Object}] An options hash;
       #   see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}

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

@@ -8,22 +8,22 @@ module Sass
     class Parser
       # The line number of the parser's current position.
       #
-      # @return [Fixnum]
+      # @return [Integer]
       def line
         @lexer.line
       end
 
       # The column number of the parser's current position.
       #
-      # @return [Fixnum]
+      # @return [Integer]
       def offset
         @lexer.offset
       end
 
       # @param str [String, StringScanner] The source text to parse
-      # @param line [Fixnum] The line on which the SassScript appears.
+      # @param line [Integer] The line on which the SassScript appears.
       #   Used for error reporting and sourcemap building
-      # @param offset [Fixnum] The character (not byte) offset where the script starts in the line.
+      # @param offset [Integer] The character (not byte) offset where the script starts in the line.
       #   Used for error reporting and sourcemap building
       # @param options [{Symbol => Object}] An options hash; see
       #   {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.