sass 3.3.0.alpha.134 → 3.3.0.alpha.136

Sign up to get free protection for your applications and to get access to all the features.
data/REVISION CHANGED
@@ -1 +1 @@
1
- 58b580372450dfc61f106842bee0fca69bd79365
1
+ 7e512381422e5d3bc60b0aec36f61a743adffc70
data/VERSION CHANGED
@@ -1 +1 @@
1
- 3.3.0.alpha.134
1
+ 3.3.0.alpha.136
data/VERSION_DATE CHANGED
@@ -1 +1 @@
1
- 24 April 2013 22:18:16 GMT
1
+ 10 May 2013 20:15:10 GMT
@@ -1614,7 +1614,7 @@ module Sass::Script
1614
1614
  # list-separator(1px, 2px, 3px) => 'comma'
1615
1615
  # list-separator('foo') => 'space'
1616
1616
  def list_separator(list)
1617
- if list.class == Sass::Script::List
1617
+ if list.is_a?(Sass::Script::List)
1618
1618
  String.new(list.separator.to_s)
1619
1619
  else
1620
1620
  String.new('space')
@@ -2435,6 +2435,19 @@ SASS
2435
2435
 
2436
2436
  # Regression tests
2437
2437
 
2438
+ def test_list_separator_with_arg_list
2439
+ assert_equal(<<CSS, render(<<SASS))
2440
+ .test {
2441
+ separator: comma; }
2442
+ CSS
2443
+ @mixin arglist-test($args...)
2444
+ separator: list-separator($args)
2445
+
2446
+ .test
2447
+ @include arglist-test(this, is, comma, separated)
2448
+ SASS
2449
+ end
2450
+
2438
2451
  def test_parent_mixin_in_content_nested
2439
2452
  assert_equal(<<CSS, render(<<SASS))
2440
2453
  a {
@@ -1239,7 +1239,9 @@ MSG
1239
1239
  end
1240
1240
 
1241
1241
  def evaluate(value, environment = env)
1242
- perform(value, environment).to_s
1242
+ result = perform(value, environment)
1243
+ assert_kind_of Sass::Script::Literal, result
1244
+ return result.to_s
1243
1245
  end
1244
1246
 
1245
1247
  def perform(value, environment = env)
@@ -556,6 +556,7 @@ SASS
556
556
  def resolve(str, opts = {}, environment = env)
557
557
  munge_filename opts
558
558
  val = eval(str, opts, environment)
559
+ assert_kind_of Sass::Script::Literal, val
559
560
  val.is_a?(Sass::Script::String) ? val.value : val.to_s
560
561
  end
561
562
 
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sass
3
3
  version: !ruby/object:Gem::Version
4
- hash: 592302593
4
+ hash: 592302621
5
5
  prerelease: 6
6
6
  segments:
7
7
  - 3
8
8
  - 3
9
9
  - 0
10
10
  - alpha
11
- - 134
12
- version: 3.3.0.alpha.134
11
+ - 136
12
+ version: 3.3.0.alpha.136
13
13
  platform: ruby
14
14
  authors:
15
15
  - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
19
19
  bindir: bin
20
20
  cert_chain: []
21
21
 
22
- date: 2013-04-24 00:00:00 -04:00
22
+ date: 2013-05-10 00:00:00 -04:00
23
23
  default_executable:
24
24
  dependencies:
25
25
  - !ruby/object:Gem::Dependency