sass 3.1.0.alpha.42 → 3.1.0.alpha.43

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.42
+3.1.0.alpha.43

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.42
+3.1.0.alpha.43

data/lib/sass/script/functions.rb

@@ -138,6 +138,11 @@ module Sass::Script
   # \{#comparable comparable($number-1, $number-2)}
   # : Returns whether two numbers can be added or compared.
   #
+  # ## Miscellaneous Functions
+  #
+  # \{#if if($condition, $if-true, $if-false)}
+  # : Returns one of two values, depending on whether or not a condition is true.
+  #
   # ## Adding Custom Functions
   #
   # New Sass functions can be added by adding Ruby methods to this module.
@@ -1078,6 +1083,24 @@ module Sass::Script
     declare :append, [:list, :val]
     declare :append, [:list, :val, :separator]
 
+    # Returns one of two values based on the truth value of the first argument.
+    #
+    # @example
+    #   if(true, 1px, 2px) => 1px
+    #   if(false, 1px, 2px) => 2px
+    # @param condition [Bool] Whether the first or second value will be returned.
+    # @param if_true [Literal] The value that will be returned if `$condition` is true.
+    # @param if_false [Literal] The value that will be returned if `$condition` is false.
+    def if(condition, if_true, if_false)
+      assert_type condition, :Bool
+      if truth.to_bool
+        if_true
+      else
+        if_false
+      end
+    end
+    declare :if, [:condition, :if_true, :if_false]
+
     private
 
     # This method implements the pattern of transforming a numeric value into

data/test/sass/functions_test.rb

@@ -668,6 +668,11 @@ MSG
     assert_error_message("Separator name must be space, comma, or auto for `append'", "append(1, 2, baboon)")
   end
 
+  def test_if
+    assert_equal("1px", evaluate("if(true, 1px, 2px)"))
+    assert_equal("2px", evaluate("if(false, 1px, 2px)"))
+  end
+
   def test_keyword_args_rgb
     assert_equal(%Q{white}, evaluate("rgb($red: 255, $green: 255, $blue: 255)"))
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.42
+  version: 3.1.0.alpha.43
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -57,6 +57,7 @@ files:
 - lib/sass/plugin.rb
 - lib/sass/script.rb
 - lib/sass/selector.rb
+- lib/sass/cache_stores.rb
 - lib/sass/plugin/configuration.rb
 - lib/sass/plugin/merb.rb
 - lib/sass/plugin/generic.rb
@@ -64,11 +65,13 @@ files:
 - lib/sass/plugin/rails.rb
 - lib/sass/plugin/staleness_checker.rb
 - lib/sass/plugin/compiler.rb
-- lib/sass/importers.rb
+- lib/sass/cache_stores/active_support.rb
+- lib/sass/cache_stores/base.rb
+- lib/sass/cache_stores/filesystem.rb
+- lib/sass/cache_stores/memory.rb
+- lib/sass/cache_stores/null.rb
 - lib/sass/repl.rb
-- lib/sass/importers/base.rb
-- lib/sass/importers/filesystem.rb
-- lib/sass/importers/rails.rb
+- lib/sass/importers.rb
 - lib/sass/root.rb
 - lib/sass/script/bool.rb
 - lib/sass/script/color.rb
@@ -96,13 +99,15 @@ files:
 - lib/sass/scss/script_lexer.rb
 - lib/sass/scss/script_parser.rb
 - lib/sass/scss/static_parser.rb
-- lib/sass/railtie.rb
+- lib/sass/importers/base.rb
+- lib/sass/importers/filesystem.rb
+- lib/sass/importers/rails.rb
 - lib/sass/selector/abstract_sequence.rb
 - lib/sass/selector/comma_sequence.rb
 - lib/sass/selector/sequence.rb
 - lib/sass/selector/simple.rb
 - lib/sass/selector/simple_sequence.rb
-- lib/sass/shared.rb
+- lib/sass/railtie.rb
 - lib/sass/tree/charset_node.rb
 - lib/sass/tree/comment_node.rb
 - lib/sass/tree/debug_node.rb
@@ -122,15 +127,10 @@ files:
 - lib/sass/tree/variable_node.rb
 - lib/sass/tree/while_node.rb
 - lib/sass/tree/media_node.rb
+- lib/sass/shared.rb
 - lib/sass/util.rb
 - lib/sass/util/subset_map.rb
 - lib/sass/version.rb
-- lib/sass/cache_stores.rb
-- lib/sass/cache_stores/active_support.rb
-- lib/sass/cache_stores/base.rb
-- lib/sass/cache_stores/filesystem.rb
-- lib/sass/cache_stores/memory.rb
-- lib/sass/cache_stores/null.rb
 - vendor/fssm/LICENSE
 - vendor/fssm/README.markdown
 - vendor/fssm/Rakefile