Cleaned up the tempalte handler code and fixed unit tests

Author: pdxmholmes

lib/typescript/rails/template_handler.rb

@@ -77,7 +77,11 @@ def self.call(template)
     def self.replace_relative_references(ts_path, source)
       ts_dir = File.dirname(File.expand_path(ts_path))
       escaped_dir = ts_dir.gsub(/["\\]/, '\\\\\&') # "\"" => "\\\"", '\\' => '\\\\'
-      source.gsub(%r!(^///\s*<reference\s+path=")([^"]+)("\s*/>\s*)!) {|m| $1 + File.join(escaped_dir, $2) + $3 }
+      %r!^///\s*<reference\s+path="([^"]+)"\s*/>\s*!.match(source) do |m|
+        source = source.sub(m.captures[0], File.join(escaped_dir, m.captures[0]))
+      end
+
+      source
     end
   end
 end

test/support/site/ref2_1.d.ts

@@ -1 +1 @@
-var f: (x: number, y: number) => number;
+declare var f: (x: number, y: number) => number;

test/template_handler_test.rb

@@ -25,17 +25,18 @@ def app
   test "typescript views are served as javascript" do
     get "/site/index.js"
 
-    assert_match "var x = 5;\r\n", last_response.body
+    s = last_response.body
+    assert_match "var x = 5;", last_response.body
   end
 
   test "<reference> to other .ts file works" do
     get "/site/ref1_2.js"
-    assert_match "var f = function (x, y) {\r\n    return x + y;\r\n};\r\nf(1, 2);\r\n", last_response.body
+    assert_match "var f = function (x, y) {\n    return x + y;\n};\nf(1, 2);\n", last_response.body
   end
 
   test "<reference> to other .d.ts file works" do
     get "/site/ref2_2.js"
-    assert_match "f(1, 2);\r\n", last_response.body
+    assert_match "f(1, 2);\n", last_response.body
   end
 
 end