sass-extras 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d3d351b6112cc349147a578edaeae7e0d333051
-  data.tar.gz: 00396c11db0ad90bbac608934d7fd673253c5548
+  metadata.gz: 609d26e3692dd22169ab7d3a5d5d3220be4daedf
+  data.tar.gz: 007c38b893bd6ed43f70cd913df2521ab79cbca1
 SHA512:
-  metadata.gz: 5ed28ac04dcfc39cf2e4c9b26eec33abae2ba48145b1de6383a87db12dcae72c2aa43439c5eb58494babd5745463e1b6099387ab40141ac9f212d701f2086565
-  data.tar.gz: 12d2bac01f5ad313f2c8c69389ef1d3b8747d8515ee374a14b7267d0a30ad676880526ba59815e2984f252501f71c26b66497025100a323469d884f8abcfaa1a
+  metadata.gz: f1cd4307bcad889513aa8aa9dda189a5623543297cf5c417d926ee96fa2df8f42e7afd33d5b585995cb58ffa3e832e7837caae394624191ad5d63d7e308b6f65
+  data.tar.gz: 3c3cb8cc6e889056d5fe5d5f9edb90931f78988c1414fbc6c23f9a0e23c658260bcf2093757cf0eb778358e013e1e6b9c0cb467febd6dac4254442821379be9b

data/lib/sass/extras.rb

@@ -3,6 +3,7 @@ require "sass/extras/version"
 require "sass/extras/contrast"
 require "sass/extras/inline_color_image"
 require "sass/extras/svg_data_urls"
+require "sass/extras/variables"
 require "sass/extras/yuv"
 
 Sass::Script::Color.class_eval do
@@ -14,5 +15,6 @@ Sass::Script::Functions.module_eval do
   include Sass::Extras::Contrast::Functions
   include Sass::Extras::InlineColorImage
   include Sass::Extras::SvgDataUrls
+  include Sass::Extras::Variables
   include Sass::Extras::YUV::Functions
 end

data/lib/sass/extras/contrast.rb

@@ -28,7 +28,8 @@ module Sass
         def luminance
           # http://www.w3.org/TR/WCAG20/#relativeluminancedef
           norm_rgb = rgb.map { |value| value.to_f / 255 }
-          Utils.sum(Utils.mul(norm_rgb.map { |v| v <= 0.03928 ? v/12.92 : ((v+0.055)/1.055) ** 2.4 }, LUMINANCE_COEFS))
+          relative_luminance = norm_rgb.map { |v| v <= 0.03928 ? v / 12.92 : ((v + 0.055) / 1.055)**2.4 }
+          Utils.sum(Utils.mul(relative_luminance, LUMINANCE_COEFS))
         end
       end
 
@@ -47,9 +48,9 @@ module Sass
           direction = color.brightness > 127 ? darken_method : lighten_method
           new_color = seed_color
           percentage = 0.0
-          until conform(new_color, color, wcag20_level.value) or percentage > 100.0 do
+          until conform(new_color, color, wcag20_level.value) || percentage > 100.0
             amount = Sass::Script::Number.new percentage, ['%']
-            new_color = self.send direction, seed_color, amount
+            new_color = send(direction, seed_color, amount)
             percentage += 0.1
           end
           new_color
@@ -123,7 +124,7 @@ module Sass
         end
 
         def self.sq(array)
-          array.map { |e| e ** 2 }
+          array.map { |e| e**2 }
         end
       end
     end

data/lib/sass/extras/variables.rb

@@ -0,0 +1,51 @@
+module Sass
+  module Extras
+    module Variables
+      def self.included(base)
+        base.declare :variable_get, [:name]
+        base.declare :global_variable_get, [:name]
+      end
+
+      # Get the value of a variable with the given name, if it exists in the
+      # current scope or in the global scope.
+      #
+      # @example
+      #   $a-false-value: false;
+      #   variable-get(a-false-value) => false
+      #
+      #   variable-get(nonexistent) => null
+      #
+      # @overload variable_get($name)
+      #   @param $name [Sass::Script::Value::String] The name of the variable to
+      #     check. The name should not include the `$`.
+      # @return [Sass::Script::Value::Bool] Whether the variable is defined in
+      #   the current scope.
+      def variable_get(name)
+        assert_type name, :String, :name
+        environment.caller.var(name.value)
+      end
+
+      # Check whether a variable with the given name exists in the global
+      # scope (at the top level of the file).
+      #
+      # @example
+      #   $a-false-value: false;
+      #   global-variable-get(a-false-value) => false
+      #
+      #   .foo {
+      #     $some-var: false;
+      #     global-variable-get(some-var) => null
+      #   }
+      #
+      # @overload global_variable_get($name)
+      #   @param $name [Sass::Script::Value::String] The name of the variable to
+      #     check. The name should not include the `$`.
+      # @return [Sass::Script::Value::Bool] Whether the variable is defined in
+      #   the global scope.
+      def global_variable_get(name)
+        assert_type name, :String, :name
+        environment.global_env.var(name.value)
+      end
+    end
+  end
+end

data/lib/sass/extras/version.rb

@@ -1,5 +1,5 @@
 module Sass
   module Extras
-    VERSION = "1.0.2"
+    VERSION = "1.1.0"
   end
 end

data/lib/sass/extras/yuv.rb

@@ -13,8 +13,8 @@ module Sass
           r, g, b = rgb.map { |k| k / 255.0 }
           y = r * WR + g * WG + b * WB
           y = 1.0 if y == W_SUM
-          u = U_MAX*(b - y)/(1 - WB)
-          v = V_MAX*(r - y)/(1 - WR)
+          u = U_MAX * (b - y) / (1 - WB)
+          v = V_MAX * (r - y) / (1 - WR)
           [y, Utils.restrict(u, -U_MAX..U_MAX), Utils.restrict(v, -V_MAX..V_MAX)]
         end
 
@@ -50,17 +50,17 @@ module Sass
 
           yv = y.value
           if y.numerator_units == ["%"] && y.denominator_units.empty?
-            raise ArgumentError.new("Brightness (Y') value #{y} must be between 0% and 100% inclusive") unless (0..100).include?(y.value)
-            yv = yv / 100.0
+            fail ArgumentError, "Brightness (Y') value #{y} must be between 0% and 100% inclusive" unless (0..100).include?(y.value)
+            yv /= 100.0
           else
-            raise ArgumentError.new("Brightness (Y') value #{y} must be between 0 and 1.0 inclusive") unless (0..1.0).include?(y.value)
+            fail ArgumentError, "Brightness (Y') value #{y} must be between 0 and 1.0 inclusive" unless (0..1.0).include?(y.value)
           end
-          raise ArgumentError.new("Chrominance (U) value #{u} must be between -#{U_MAX} and #{U_MAX} inclusive") unless (-U_MAX..U_MAX).include?(u.value)
-          raise ArgumentError.new("Chrominance (V) value #{v} must be between -#{V_MAX} and #{V_MAX} inclusive") unless (-V_MAX..V_MAX).include?(v.value)
+          fail ArgumentError, "Chrominance (U) value #{u} must be between -#{U_MAX} and #{U_MAX} inclusive" unless (-U_MAX..U_MAX).include?(u.value)
+          fail ArgumentError, "Chrominance (V) value #{v} must be between -#{V_MAX} and #{V_MAX} inclusive" unless (-V_MAX..V_MAX).include?(v.value)
 
-          r = yv + v.value * (1 - WR)/(V_MAX)
-          g = yv - u.value * (WB * (1 - WB))/(V_MAX * WG) - v.value * (WR * (1 - WR))/(V_MAX * WG)
-          b = yv + u.value * (1 - WB)/U_MAX
+          r = yv + v.value * (1 - WR) / (V_MAX)
+          g = yv - u.value * (WB * (1 - WB)) / (V_MAX * WG) - v.value * (WR * (1 - WR)) / (V_MAX * WG)
+          b = yv + u.value * (1 - WB) / U_MAX
 
           rgb = [r, g, b].map { |c| [0, [255, c * 255].min].max }
           Sass::Script::Color.new(rgb)
@@ -68,13 +68,13 @@ module Sass
 
         def yuva(y, u, v, a)
           assert_type a, :Number, :a
-          yuv(y, u, v).with(:alpha => a.value)
+          yuv(y, u, v).with(alpha: a.value)
         end
 
         # @param color [Color]
         # @param amount [Number] between 0 and 1.0, or 0% and 100%
         def set_brightness(color, amount)
-          adjust_brightness(color, amount) { |c, y| c }
+          adjust_brightness(color, amount) { |c, _| c }
         end
 
         # @param color [Color]
@@ -107,10 +107,10 @@ module Sass
           y, u, v, a = color.yuva.map { |x| Sass::Script::Number.new x }
           c = amount.value
           if amount.numerator_units == ["%"] && amount.denominator_units.empty?
-            raise ArgumentError.new("Amount value #{amount} must be between 0% and 100% inclusive") unless (0..100).include?(c)
-            c = c / 100.0
+            fail ArgumentError, "Amount value #{amount} must be between 0% and 100% inclusive" unless (0..100).include?(c)
+            c /= 100.0
           else
-            raise ArgumentError.new("Amount value #{amount} must be between 0 and 1.0 inclusive") unless (0..1.0).include?(c)
+            fail ArgumentError, "Amount value #{amount} must be between 0 and 1.0 inclusive" unless (0..1.0).include?(c)
           end
           y = Sass::Script::Number.new yield(c, y.value)
           yuva(y, u, v, a)

data/specs/variables_spec.rb

@@ -0,0 +1,48 @@
+require_relative "spec_helper"
+
+describe Sass::Extras::Variables do
+  describe "variable-get" do
+    it "gets the value of a local variable" do
+      unindent(<<-CSS).must_equal render(unindent(<<-SCSS))
+        a {
+          b: 42; }
+      CSS
+        a {
+          $my-local-var: 42;
+          b: variable-get(my-local-var); }
+      SCSS
+    end
+
+    it "also gets variables from the global scope" do
+      unindent(<<-CSS).must_equal render(unindent(<<-SCSS))
+        a {
+          b: 42; }
+      CSS
+        $my-global-var: 42;
+        a {
+          b: variable-get(my-global-var); }
+      SCSS
+    end
+  end
+
+  describe "global-variable-get" do
+    it "get the value of a global variable" do
+      unindent(<<-CSS).must_equal render(unindent(<<-SCSS))
+        a {
+          b: 42; }
+      CSS
+        $my-global-var: 42;
+        a {
+          b: global-variable-get(my-global-var); }
+      SCSS
+    end
+  end
+
+  def unindent(s)
+    s.gsub(/^#{s.scan(/^[ \t]+(?=\S)/).min}/, "")
+  end
+
+  def render(scss)
+    Sass::Engine.new(scss, syntax: :scss).render
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-extras
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Tobias Haagen Michaelsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -112,11 +112,13 @@ files:
 - lib/sass/extras/contrast.rb
 - lib/sass/extras/inline_color_image.rb
 - lib/sass/extras/svg_data_urls.rb
+- lib/sass/extras/variables.rb
 - lib/sass/extras/version.rb
 - lib/sass/extras/yuv.rb
 - sass-extras.gemspec
 - specs/contrast_spec.rb
 - specs/spec_helper.rb
+- specs/variables_spec.rb
 - specs/yuv_spec.rb
 homepage: https://github.com/tobiashm/sass-extras
 licenses:
@@ -138,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A collection of SASS extensions.