haml-edge 2.3.181 → 2.3.182

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.181
+2.3.182

data/Rakefile

@@ -92,6 +92,7 @@ task :release_elpa do
   require 'time'
   require scope('lib/haml')
 
+  next if Haml.version[:prerelease]
   version = Haml.version[:number]
 
   haml_unchanged = mode_unchanged?(:haml, version)

data/VERSION

@@ -1 +1 @@
-2.3.181
+2.3.182

data/lib/haml/version.rb

@@ -23,11 +23,27 @@ module Haml
     #       :major  => 2, :minor => 1, :teeny => 0
     #     }
     #
+    # If a prerelease version of Haml is being used,
+    # the `:string` and `:number` fields will reflect the full version
+    # (e.g. `"2.2.beta.1"`), and the `:tiny` field will be `-1`.
+    # A `:prerelease` key will contain the name of the prerelease (e.g. `"beta"`),
+    # and a `:prerelease_number` key will contain the rerelease number.
+    # For example:
+    #
+    #     {
+    #       :string => "3.0.beta.1",
+    #       :number => "3.0.beta.1",
+    #       :major => 3, :minor => 0, :tiny => -1,
+    #       :prerelease => "beta",
+    #       :prerelease_number => 1
+    #     }
+    #
     # @return [{Symbol => String/Fixnum}] The version hash
     def version
       return @@version if defined?(@@version)
 
-      numbers = File.read(scope('VERSION')).strip.split('.').map { |n| n.to_i }
+      numbers = File.read(scope('VERSION')).strip.split('.').
+        map {|n| n =~ /^[0-9]+$/ ? n.to_i : n}
       name = File.read(scope('VERSION_NAME')).strip
       @@version = {
         :major => numbers[0],
@@ -35,7 +51,14 @@ module Haml
         :teeny => numbers[2],
         :name => name
       }
-      @@version[:number] = [:major, :minor, :teeny].map { |comp| @@version[comp] }.compact.join('.')
+
+      if numbers[3].is_a?(String)
+        @@version[:teeny] = -1
+        @@version[:prerelease] = numbers[3]
+        @@version[:prerelease_number] = numbers[4]
+      end
+
+      @@version[:number] = numbers.join('.')
       @@version[:string] = @@version[:number].dup
 
       if rev = revision_number

data/lib/sass/script/parser.rb

@@ -248,6 +248,7 @@ RUBY
 
           if tok.type == :single_eq
             val.context = :equals
+            val.options = @options
             Script.equals_warning("mixin argument defaults", "$#{c.value}",
               val.to_sass, false, line, offset, @options[:filename])
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.181
+  version: 2.3.182
 platform: ruby
 authors: 
 - Nathan Weizenbaum