chriseppstein / haml fork watch download tarball
public
Rubygem
Fork of nex3/haml
Description: HTML Abstraction Markup Language - A Markup Haiku
Homepage: http://haml.hamptoncatlin.com
Clone URL: git://github.com/chriseppstein/haml.git 
changed the colon delimited path list to use an array instead. A bare 
string may also be supplied for :template_location and :css_location
chriseppstein (author)
Tue Jul 08 20:39:47 -0700 2008
commit  2a11d84fd09cc168e034756a2f4b757169c2d869
tree    9a017a6ebc658646f9c09e12cad5bf06cba5e94d
parent  1816e45af867d5fd0b8dfea89fd5a81b92af585a
0
lib/sass/plugin.rb 
...
94
95
96
97
 
98
99
100
101
 
102
103
104
...
153
154
155
156
 
157
158
159
160
161
 
162
163
164
 
...
94
95
96
 
97
98
99
100
 
101
102
103
104
...
153
154
155
 
156
157
158
159
160
 
161
162
163
164
 
0
@@ -94,11 +94,11 @@ module Sass
0
       end
0
       
0
       def template_locations
0
-        (options[:template_location] || default_template_location).split(':')
0
+        Array(options[:template_location] || default_template_location)
0
       end
0
 
0
       def css_locations
0
-        (options[:css_location] || default_css_location).split(':')
0
+        Array(options[:css_location] || default_css_location)
0
       end
0
 
0
       # map template locations to css locations
0
@@ -153,12 +153,12 @@ END
0
       end
0
 
0
       def default_css_location
0
-        options[:css_location].split(':').first
0
+        Array(options[:css_location]).first
0
       end
0
 
0
       def default_template_location
0
         if options[:template_location]
0
-          options[:template_location].split(':').first
0
+          Array(options[:template_location]).first
0
         else
0
           File.join(default_css_location,'sass')
0
         end
0
test/sass/plugin_test.rb 
...
74
75
76
77
78
 
 
79
80
81
 
...
74
75
76
 
 
77
78
79
80
81
 
0
@@ -74,8 +74,8 @@ class SassPluginTest < Test::Unit::TestCase
0
   
0
   def test_two_template_directories
0
     set_plugin_opts \
0
-      :template_location => ['templates', 'more_templates'].map{|t| File.dirname(__FILE__) + "/#{t}"}.join(':'),
0
-      :css_location => ['tmp', 'more_tmp'].map{|c| File.dirname(__FILE__) + "/#{c}"}.join(':')
0
+      :template_location => ['templates', 'more_templates'].map{|t| File.dirname(__FILE__) + "/#{t}"},
0
+      :css_location => ['tmp', 'more_tmp'].map{|c| File.dirname(__FILE__) + "/#{c}"}
0
     Sass::Plugin.update_stylesheets
0
     ['more1', 'more_import'].each { |name| assert_renders_correctly(name, 'more_') }
0
   end

Comments

    No one has commented yet.