sass 3.3.0.alpha.88 → 3.3.0.alpha.93

data/REVISION

@@ -1 +1 @@
-c8154cc19b995b06961c60fb376d9c4821f8bde1
+655e8ae0d3bcab12d522eac27a7f7cb876475756

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.88
+3.3.0.alpha.93

data/VERSION_DATE

@@ -1 +1 @@
-18 February 2013 01:09:19 GMT
+23 February 2013 01:38:58 GMT

data/lib/sass/environment.rb

@@ -43,6 +43,10 @@ module Sass
       @content || (@parent && @parent.content)
     end
 
+    def global_env
+      @global_env ||= parent.nil? ? self : parent.global_env
+    end
+
     private
 
     class << self

data/lib/sass/script/funcall.rb

@@ -103,7 +103,8 @@ module Sass
         unless Functions.callable?(ruby_name)
           opts(to_literal(args))
         else
-          opts(Functions::EvaluationContext.new(environment.options).send(ruby_name, *args))
+          local_environment = Environment.new(environment.global_env, environment.options)
+          opts(Functions::EvaluationContext.new(local_environment).send(ruby_name, *args))
         end
       rescue ArgumentError => e
         # If this is a legitimate Ruby-raised argument error, re-raise it.

data/lib/sass/script/functions.rb

@@ -327,14 +327,21 @@ module Sass::Script
     class EvaluationContext
       include Functions
 
+
+      # The environment of the {Sass::Engine}
+      #
+      # @return [Environment]
+      attr_reader :environment
+
       # The options hash for the {Sass::Engine} that is processing the function call
       #
       # @return [{Symbol => Object}]
       attr_reader :options
 
-      # @param options [{Symbol => Object}] See \{#options}
-      def initialize(options)
-        @options = options
+      # @param environment [Environment] See \{#environment}
+      def initialize(environment)
+        @environment = environment
+        @options = environment.options
       end
 
       # Asserts that the type of a given SassScript value

data/lib/sass/tree/visitors/perform.rb

@@ -3,7 +3,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   # @param root [Tree::Node] The root node of the tree to visit.
   # @param environment [Sass::Environment] The lexical environment.
   # @return [Tree::Node] The resulting tree of static nodes.
-  def self.visit(root, environment = Sass::Environment.new)
+  def self.visit(root, environment = nil)
     new(environment).send(:visit, root)
   end
 

data/test/sass/engine_test.rb

@@ -11,6 +11,15 @@ module Sass::Script::Functions::UserFunctions
   def option(name)
     Sass::Script::String.new(@options[name.value.to_sym].to_s)
   end
+
+  def set_a_variable(name, value)
+    environment.set_var(name.value, value)
+    return Sass::Script::Null.new
+  end
+
+  def get_a_variable(name)
+    environment.var(name.value) || Sass::Script::String.new("undefined")
+  end
 end
 
 class SassEngineTest < Test::Unit::TestCase
@@ -1400,6 +1409,44 @@ bar
 SASS
   end
 
+  def test_user_defined_function_variable_scope
+    render(<<SASS)
+bar
+  -no-op: set-a-variable(variable, 5)
+  a: $variable
+SASS
+    flunk("Exception not raised for test_user_defined_function_variable_scope")
+  rescue Sass::SyntaxError => e
+    assert_equal('Undefined variable: "$variable".', e.message)
+  end
+
+  def test_user_defined_function_can_change_global_variable
+    assert_equal(<<CSS, render(<<SASS))
+bar {
+  a: 5; }
+CSS
+$variable: 0
+bar
+  $local: 10
+  -no-op: set-a-variable(variable, 5)
+  a: $variable
+SASS
+  end
+
+  def test_user_defined_function_cannot_read_local_variable
+    assert_equal(<<CSS, render(<<SASS))
+bar {
+  global: 0;
+  local: undefined; }
+CSS
+$global: 0
+bar
+  $local: 10
+  global: get-a-variable(global)
+  local: get-a-variable(local)
+SASS
+  end
+
   def test_control_directive_in_nested_property
     assert_equal(<<CSS, render(<<SASS))
 foo {

data/test/sass/functions_test.rb

@@ -33,6 +33,10 @@ module Sass::Script::Functions::UserFunctions
   def _preceding_underscore
     Sass::Script::String.new("I'm another user-defined string!")
   end
+
+  def fetch_the_variable
+    environment.var('variable')
+  end
 end
 
 module Sass::Script::Functions
@@ -949,6 +953,11 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("I'm another user-defined string!", evaluate("-preceding-underscore()"))
   end
 
+  def test_user_defined_function_using_environment
+    environment = env('variable' => Sass::Script::String.new('The variable'))
+    assert_equal("The variable", evaluate("fetch_the_variable()", environment))
+  end
+
   def test_options_on_new_literals_fails
     assert_error_message(<<MSG, "call-options-on-new-literal()")
 The #options attribute is not set on this Sass::Script::String.
@@ -1194,13 +1203,18 @@ MSG
   end
 
   private
+  def env(hash = {})
+    env = Sass::Environment.new
+    hash.each {|k, v| env.set_var(k, v)}
+    env
+  end
 
-  def evaluate(value)
-    Sass::Script::Parser.parse(value, 0, 0).perform(Sass::Environment.new).to_s
+  def evaluate(value, environment = env)
+    perform(value, environment).to_s
   end
 
-  def perform(value)
-    Sass::Script::Parser.parse(value, 0, 0).perform(Sass::Environment.new)
+  def perform(value, environment = env)
+    Sass::Script::Parser.parse(value, 0, 0).perform(environment)
   end
 
   def assert_error_message(message, value)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592303037
+  hash: 592303031
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 88
-  version: 3.3.0.alpha.88
+  - 93
+  version: 3.3.0.alpha.93
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-17 00:00:00 -05:00
+date: 2013-02-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency