compass 0.12.alpha.0 → 0.12.alpha.1

data/lib/compass/sass_extensions/functions/enumerate.rbc

@@ -1,5 +1,5 @@
 !RBIX
-333337424968067900
+9595534255132031488
 x
 M
 1
@@ -352,8 +352,8 @@ I
 I
 1e
 x
-80
-/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/enumerate.rb
+82
+/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/enumerate.rb
 p
 1
 x
@@ -390,8 +390,8 @@ I
 I
 76
 x
-80
-/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/enumerate.rb
+82
+/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/enumerate.rb
 p
 5
 x
@@ -424,8 +424,8 @@ I
 I
 10
 x
-80
-/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/enumerate.rb
+82
+/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/enumerate.rb
 p
 0
 x
@@ -440,7 +440,7 @@ I
 I
 22
 x
-80
-/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/enumerate.rb
+82
+/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/enumerate.rb
 p
 0

data/lib/compass/sass_extensions/functions/env.rb

@@ -0,0 +1,5 @@
+module Compass::SassExtensions::Functions::Env
+  def compass_env
+    Sass::Script::String.new((options[:compass][:environment] || "development").to_s)
+  end
+end

data/lib/compass/sass_extensions/functions/env.rbc

@@ -0,0 +1,299 @@
+!RBIX
+9595534255132031488
+x
+M
+1
+n
+n
+x
+10
+__script__
+i
+34
+99
+7
+0
+45
+1
+2
+43
+3
+43
+4
+49
+5
+2
+13
+99
+12
+7
+6
+12
+7
+7
+12
+65
+12
+49
+8
+4
+15
+49
+6
+0
+15
+2
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+9
+x
+3
+Env
+x
+7
+Compass
+n
+x
+14
+SassExtensions
+x
+9
+Functions
+x
+17
+open_module_under
+x
+15
+__module_init__
+M
+1
+n
+n
+x
+3
+Env
+i
+16
+5
+66
+99
+7
+0
+7
+1
+65
+67
+49
+2
+0
+49
+3
+4
+11
+I
+5
+I
+0
+I
+0
+I
+0
+n
+p
+4
+x
+11
+compass_env
+M
+1
+n
+n
+x
+11
+compass_env
+i
+75
+45
+0
+1
+43
+2
+43
+3
+13
+71
+4
+47
+9
+48
+47
+49
+5
+0
+13
+5
+48
+6
+7
+7
+49
+8
+1
+7
+9
+49
+8
+1
+13
+10
+38
+15
+7
+10
+64
+49
+11
+0
+47
+49
+12
+1
+15
+8
+74
+5
+48
+6
+7
+7
+49
+8
+1
+7
+9
+49
+8
+1
+13
+10
+68
+15
+7
+10
+64
+49
+11
+0
+49
+4
+1
+11
+I
+4
+I
+0
+I
+0
+I
+0
+n
+p
+13
+x
+4
+Sass
+n
+x
+6
+Script
+x
+6
+String
+x
+3
+new
+x
+8
+allocate
+x
+7
+options
+x
+7
+compass
+x
+2
+[]
+x
+11
+environment
+s
+11
+development
+x
+4
+to_s
+x
+10
+initialize
+p
+5
+I
+-1
+I
+2
+I
+0
+I
+3
+I
+4b
+x
+76
+/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/env.rb
+p
+0
+x
+17
+method_visibility
+x
+15
+add_defn_method
+p
+3
+I
+2
+I
+2
+I
+10
+x
+76
+/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/env.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+0
+I
+1
+I
+22
+x
+76
+/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/env.rb
+p
+0

data/lib/compass/sass_extensions/functions/font_files.rb

@@ -1,10 +1,39 @@
 module Compass::SassExtensions::Functions::FontFiles
+  FONT_TYPES = {
+    :woff => 'woff',
+    :otf => 'opentype',
+    :opentype => 'opentype',
+    :ttf => 'truetype',
+    :truetype => 'truetype',
+    :svg => 'svg'
+  }
+
   def font_files(*args)
-    raise Sass::SyntaxError, "An even number of arguments must be passed to font_files()" unless args.size % 2 == 0
     files = []
-    while args.size > 0
-      files << "#{font_url(args.shift)} format('#{args.shift}')"
+    args_length = args.length
+    skip_next = false
+
+    args.each_with_index do |arg, index|
+      if skip_next
+        skip_next = false
+        next
+      end
+
+      type = (args_length > (index + 1)) ? args[index + 1].value.to_sym : :wrong
+
+      if FONT_TYPES.key? type
+        skip_next = true
+      else
+        type = arg.to_s.split('.').last.gsub('"', '').to_sym
+      end
+
+      if FONT_TYPES.key? type
+        files << "#{font_url(arg)} format('#{FONT_TYPES[type]}')"
+      else
+        raise Sass::SyntaxError, "Could not determine font type for #{arg}"
+      end
     end
+
     Sass::Script::String.new(files.join(", "))
   end
 end

data/lib/compass/sass_extensions/functions/font_files.rbc

@@ -1,5 +1,5 @@
 !RBIX
-333337424968067900
+9595534255132031488
 x
 M
 1
@@ -82,25 +82,100 @@ x
 9
 FontFiles
 i
-16
+91
 5
 66
-99
+65
 7
 0
-7
+44
+43
+1
+4
+6
+49
+2
 1
+13
+7
+3
+7
+4
+64
+49
+5
+2
+15
+13
+7
+6
+7
+7
+64
+49
+5
+2
+15
+13
+7
+8
+7
+7
+64
+49
+5
+2
+15
+13
+7
+9
+7
+10
+64
+49
+5
+2
+15
+13
+7
+11
+7
+10
+64
+49
+5
+2
+15
+13
+7
+12
+7
+13
+64
+49
+5
+2
+15
+49
+14
+2
+15
+99
+7
+15
+7
+16
 65
 67
 49
-2
+17
 0
 49
-3
+18
 4
 11
 I
-5
+6
 I
 0
 I
@@ -109,7 +184,52 @@ I
 0
 n
 p
+19
+x
+10
+FONT_TYPES
+x
 4
+Hash
+x
+16
+new_from_literal
+x
+4
+woff
+s
+4
+woff
+x
+3
+[]=
+x
+3
+otf
+s
+8
+opentype
+x
+8
+opentype
+x
+3
+ttf
+s
+8
+truetype
+x
+8
+truetype
+x
+3
+svg
+s
+3
+svg
+x
+9
+const_set
 x
 10
 font_files
@@ -121,191 +241,450 @@ x
 10
 font_files
 i
-129
+70
+35
+0
+19
+1
+15
 20
 0
 49
 0
 0
-80
-49
-1
-1
-78
-83
+19
 2
-9
-17
+15
+3
+19
+3
+15
+20
+0
+56
 1
-8
-30
-5
+50
+2
+0
+15
 45
 3
 4
 43
 5
-7
+43
 6
+13
+71
+7
+47
+9
+58
+47
+49
+8
+0
+13
+20
+1
+7
+9
 64
+49
+10
+1
 47
 49
+11
+1
+15
+8
+69
+20
+1
 7
+9
+64
+49
+10
+1
+49
+7
+1
+11
+I
+8
+I
+4
+I
+0
+I
+0
+I
+0
+p
+12
+x
+6
+length
+M
+1
+p
 2
-15
-35
+x
+9
+for_block
+t
+n
+x
+10
+font_files
+i
+172
+58
+37
+19
 0
+15
+37
 19
 1
 15
+15
+21
+1
+3
+9
+24
+3
+22
+1
+3
+15
+1
+11
+8
+25
+1
+15
+21
+1
+2
 20
+1
+79
+81
+0
+85
+1
+9
+57
+21
+1
 0
+20
+1
+79
+81
+0
+49
+2
+1
 49
+3
 0
+49
+4
 0
+8
+59
+7
+5
+19
+2
+15
+45
+6
+7
+20
+2
+49
+8
+1
+9
 78
-85
+2
+22
+1
+3
 8
+106
+20
+0
+49
 9
-82
+0
+7
+10
+64
+49
+11
+1
+49
+12
+0
+7
+13
+64
+7
+14
+64
+49
+15
+2
+49
+4
+0
+19
+2
+15
+45
+6
+16
 20
+2
+49
+8
+1
+9
+152
+21
+1
 1
 5
 20
 0
-49
-9
-0
 47
 49
-10
+17
 1
 47
 101
-11
+9
 7
-12
+18
+45
+6
+19
 20
-0
+2
 49
-9
-0
+2
+1
 47
 101
-11
+9
 7
-13
+20
 63
 4
 49
-14
+21
 1
-15
-68
 8
-36
-1
-15
+171
+5
 45
-3
-15
-43
-16
+22
+23
 43
-17
-13
-71
-18
-47
-9
-117
-47
-49
-19
-0
-13
-20
-1
+24
 7
+25
 20
-64
-49
-21
-1
+0
+47
+101
+9
+63
+2
 47
 49
-22
-1
-15
-8
-128
-20
-1
-7
-20
-64
-49
-21
-1
-49
-18
-1
+26
+2
 11
 I
-7
-I
-2
+9
 I
-0
+3
 I
-0
+2
 I
-0
+2
+n
 p
-23
+27
 x
-4
-size
+1
++
 x
 1
-%
+>
 x
 2
-==
+[]
 x
-4
-Sass
+5
+value
+x
+6
+to_sym
+x
+5
+wrong
+x
+10
+FONT_TYPES
 n
 x
-11
-SyntaxError
+4
+key?
+x
+4
+to_s
 s
-58
-An even number of arguments must be passed to font_files()
+1
+.
 x
 5
-raise
+split
 x
+4
+last
+s
 1
->
+"
+s
+0
+
 x
-5
-shift
+4
+gsub
+n
 x
 8
 font_url
-x
-4
-to_s
 s
 9
  format('
+n
 s
 2
 ')
 x
 2
 <<
+x
+4
+Sass
+n
+x
+11
+SyntaxError
+s
+34
+Could not determine font type for 
+x
+5
+raise
+p
+33
+I
+0
+I
+10
+I
+a
+I
+11
+I
+f
+I
+12
+I
+14
+I
+13
+I
+18
+I
+11
+I
+19
+I
+0
+I
+1a
+I
+16
+I
+3b
+I
+16
+I
+3e
+I
+18
+I
+48
+I
+19
+I
+4e
+I
+1b
+I
+6a
+I
+0
+I
+6b
+I
+1e
+I
+75
+I
+1f
+I
+98
+I
+21
+I
+ab
+I
+0
+I
+ac
+x
+83
+/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/font_files.rb
+p
+3
+x
+3
+arg
+x
+5
+index
+x
+4
+type
+x
+15
+each_with_index
+x
+4
+Sass
 n
 x
 6
@@ -333,34 +712,34 @@ p
 I
 -1
 I
-2
+b
 I
 0
 I
-3
+c
 I
-1f
+5
 I
-4
+d
 I
-24
+d
 I
-5
+e
 I
-2e
+11
 I
-6
+10
 I
-54
+19
 I
-8
+25
 I
-81
+46
 x
-81
-/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/font_files.rb
+83
+/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/font_files.rb
 p
-2
+4
 x
 4
 args
@@ -368,22 +747,60 @@ x
 5
 files
 x
+11
+args_length
+x
+9
+skip_next
+x
 17
 method_visibility
 x
 15
 add_defn_method
 p
-3
+19
 I
 2
 I
 2
 I
-10
+5
+I
+9
+I
+e
+I
+3
+I
+18
+I
+4
+I
+22
+I
+5
+I
+2c
+I
+6
+I
+36
+I
+7
+I
+40
+I
+8
+I
+4d
+I
+b
+I
+5b
 x
-81
-/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/font_files.rb
+83
+/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/font_files.rb
 p
 0
 x
@@ -398,7 +815,7 @@ I
 I
 22
 x
-81
-/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/font_files.rb
+83
+/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/font_files.rb
 p
 0