Add newlines to MinispadeFilter output.

wycats · Jan 1, 2012 · 56678c5 · 56678c5
1 parent c76b66c
commit 56678c5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/lib/rake-pipeline-web-filters/minispade_filter.rb b/lib/rake-pipeline-web-filters/minispade_filter.rb
@@ -41,9 +41,9 @@ def generate_output(inputs, output)
       inputs.each do |input|
         code = input.read
         code.gsub!(%r{^\s*require\(}, 'minispade.require(') if @rewrite_requires
-        code = '"use strict"; ' + code if @use_strict
-        function = "function() {#{code}}"
-        ret = "minispade.register('#{@module_id_generator.call(input)}',#{function});"
+        code = %["use strict";\n] + code if @use_strict
+        function = "function() {\n#{code}\n}"
+        ret = "minispade.register('#{@module_id_generator.call(input)}', #{function});\n"
         output.write ret
       end
     end

diff --git a/spec/minispade_filter_spec.rb b/spec/minispade_filter_spec.rb
@@ -29,24 +29,24 @@ def make_filter(input_file, *args)
     filter.output_files.should == output_files
     output_file.encoding.should == "UTF-8"
     output_file.body.should ==
-      "minispade.register('/path/to/input/foo.js',function() { var foo = 'bar'; });"
+      "minispade.register('/path/to/input/foo.js',function() {\nvar foo = 'bar';\n});\n"
   end
 
   it "uses strict if asked" do
     filter = make_filter(input_file, :use_strict => true)
     output_file.body.should ==
-      "minispade.register('/path/to/input/foo.js',function() { \"use strict\"; var foo = 'bar'; });"
+      "minispade.register('/path/to/input/foo.js',function() {\n\"use strict\";\nvar foo = 'bar';\n});\n"
   end
 
   it "takes a proc to name the module" do
     filter = make_filter(input_file, :module_id_generator => proc { |input| "octopus" })
     output_file.body.should ==
-      "minispade.register('octopus',function() { var foo = 'bar'; });"
+      "minispade.register('octopus',function() {\nvar foo = 'bar';\n});\n"
   end
 
   it "rewrites requires if asked" do
     filter = make_filter(input_file("require('octopus');"), :rewrite_requires => true)
     output_file.body.should ==
-      "minispade.register('/path/to/input/foo.js',function() { minispade.require('octopus'); });"
+      "minispade.register('/path/to/input/foo.js',function() {\nminispade.require('octopus');\n});\n"
   end
 end