Added unit test for multi-ref files and fixed a bug the test revealed

pdxmholmes · pdxmholmes · commit e3ad1759d86b · 2013-07-24T19:53:34.000-07:00
diff --git a/lib/typescript/rails/template_handler.rb b/lib/typescript/rails/template_handler.rb
@@ -77,11 +77,19 @@ 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(/["\\]/, '\\\\\&') # "\"" => "\\\"", '\\' => '\\\\'
-      %r!^///\s*<reference\s+path="([^"]+)"\s*/>\s*!.match(source) do |m|
-        source = source.sub(m.captures[0], File.join(escaped_dir, m.captures[0]))
+
+      # Why don't we just use gsub? Because it display odd behavior with File.join on Ruby 2.0
+      # So we go the long way around.
+      output = ''
+      source.each_line do |l|
+        if l.starts_with?('///') && !(m = %r!^///\s*<reference\s+path="([^"]+)"\s*/>\s*!.match(l)).nil?
+          l = l.sub(m.captures[0], File.join(escaped_dir, m.captures[0]))
+        end
+
+        output = output + l + $/
       end
 
-      source
+      output
     end
   end
 end
diff --git a/test/support/site/ref3_1.js.ts b/test/support/site/ref3_1.js.ts
@@ -0,0 +1,5 @@
+/// <reference path="ref3_2.ts" />
+/// <reference path="ref3_3.ts" />
+
+f1();
+f2();
diff --git a/test/support/site/ref3_2.ts b/test/support/site/ref3_2.ts
@@ -0,0 +1,3 @@
+var f1 = function() {
+
+};
diff --git a/test/support/site/ref3_3.ts b/test/support/site/ref3_3.ts
@@ -0,0 +1,3 @@
+var f2 = function() {
+
+};
diff --git a/test/template_handler_test.rb b/test/template_handler_test.rb
@@ -13,6 +13,7 @@ class SiteController < ActionController::Base
   get "site/ref1_2"
   get "site/ref2_1"
   get "site/ref2_2"
+  get "site/ref3_1"
 end
 
 class TemplateHandlerTest < ActiveSupport::TestCase
@@ -39,4 +40,10 @@ def app
     assert_match /f\(1, 2\);\s*/, last_response.body
   end
 
+  test "<reference> to multiple .ts files works" do
+    get "/site/ref3_1.js"
+    assert_match /var f1 = function \(\) \{\s\};\s*var f2 = function \(\) \{\s*\};\s*f1\(\);\s*f2\(\);\s*/,
+                 last_response.body
+  end
+
 end

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +/// <reference path="ref3_2.ts" />
 +/// <reference path="ref3_3.ts" />
++
 +f1();
 +f2();