Merge pull request #11 from brainling/master

gfx · gfx · commit de78697373bd · 2014-07-30T08:22:38.000+09:00
Updated with two fixes for Rails 4 and Ruby 2.0.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.idea/*
 *.gem
 *.rbc
 .bundle
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 rvm:
  - 1.9.2
  - 1.9.3
+ - 2.0.0
  - ree
  - jruby
  - rbx
diff --git a/lib/typescript/rails/railtie.rb b/lib/typescript/rails/railtie.rb
@@ -4,7 +4,7 @@ class Railtie < ::Rails::Railtie
       config.before_initialize do |app|
         require 'typescript-rails'
 
-        if app.config.assets.enabled
+        if ::Rails::VERSION::MAJOR >= 4 || app.config.assets.enabled
           require 'sprockets'
           require 'sprockets/engines'
           Sprockets.register_engine '.ts', Typescript::Rails::TypeScriptTemplate
diff --git a/lib/typescript/rails/template_handler.rb b/lib/typescript/rails/template_handler.rb
@@ -77,7 +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(/["\\]/, '\\\\\&') # "\"" => "\\\"", '\\' => '\\\\'
-      source.gsub(%r!(^///\s*<reference\s+path=")([^/"][^"]+)("\s*/>)!, '\1' + File.join(escaped_dir, '\2') + '\3')
+
+      # 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
+
+      output
     end
   end
 end
diff --git a/lib/typescript/rails/version.rb b/lib/typescript/rails/version.rb
@@ -1,5 +1,5 @@
 module Typescript
   module Rails
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   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
@@ -25,17 +26,24 @@ 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;\s*/, 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\) \{\s*return x \+ y;\s*\};\s*f\(1, 2\);\s*/, 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\);\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 number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+.idea/*`
`1`	`2`	`*.gem`
`2`	`3`	`*.rbc`
`3`	`4`	`.bundle`
-Original file line number
+Diff line change
@@ @@ -1,6 +1,7 @@ @@
 rvm:
  - 1.9.2
  - 1.9.3
 + - 2.0.0
  - ree
  - jruby
  - rbx