Merge pull request #6 from tkawachi/typescript-node

Use typescript-node gem which can handle /// <reference>

Author: klaustopher

.travis.yml

@@ -1,5 +1,4 @@
 rvm:
- - 1.8.7
  - 1.9.2
  - 1.9.3
  - ree

lib/assets/javascripts/typescript.js.erb

@@ -1 +1 @@
-<%= TypeScript::Source.contents %>
+<%= TypeScript::Src.js_content %>

lib/typescript-rails.rb

@@ -1,4 +1,4 @@
-require "typescript"
+require "typescript-node"
 require "typescript/rails/railtie"
 require "typescript/rails/engine"
 require "typescript/rails/template_handler"

lib/typescript/rails/template_handler.rb

@@ -41,7 +41,7 @@ def prepare
       end
 
       def evaluate(scope, locals, &block)
-        @output ||= TypeScript.compile(data, options)
+        @output ||= TypeScript::Node.compile(data)
       end
 
       def allows_script?
@@ -51,13 +51,13 @@ def allows_script?
 
     class TemplateHandler
 
-       def self.erb_handler
+      def self.erb_handler
         @@erb_handler ||= ActionView::Template.registered_template_handler(:erb)
       end
 
       def self.call(template)
         compiled_source = erb_handler.call(template)
-        "TypeScript.compile(begin;#{compiled_source};end)"
+        "TypeScript::Node.compile(begin;#{compiled_source};end)"
       end
     end
   end

test/support/site/ref1_1.js.ts

@@ -0,0 +1,3 @@
+var f = function(x: number, y: number): number {
+  return x + y
+}

test/support/site/ref1_2.js.ts

@@ -0,0 +1,3 @@
+/// <reference path="<%= File.join(File.dirname(__FILE__), "ref1_1.js.ts") %>" />
+
+f(1, 2)

test/support/site/ref2_1.d.ts

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

test/support/site/ref2_2.js.ts

@@ -0,0 +1,3 @@
+/// <reference path="<%= File.join(File.dirname(__FILE__), "ref2_1.d.ts") %>" />
+
+f(1, 2)

test/template_handler_test.rb

@@ -9,6 +9,10 @@ class SiteController < ActionController::Base
 DummyApp = ActionDispatch::Routing::RouteSet.new
 DummyApp.draw do
   get "site/index"
+  get "site/ref1_1"
+  get "site/ref1_2"
+  get "site/ref2_1"
+  get "site/ref2_2"
 end
 
 class TemplateHandlerTest < ActiveSupport::TestCase
@@ -21,6 +25,17 @@ def app
   test "typescript views are served as javascript" do
     get "/site/index.js"
 
-    assert_match "var x = 5;\n", last_response.body
+    assert_match "var x = 5;\r\n", last_response.body
   end
-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
+  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
+  end
+
+end

typescript-rails.gemspec

@@ -16,12 +16,14 @@ Gem::Specification.new do |gem|
 
   gem.rubyforge_project = "typescript-rails"
 
-  gem.add_runtime_dependency 'typescript', '~> 0.1.1'
+  gem.add_runtime_dependency 'typescript-node', '~> 0.0'
   gem.add_runtime_dependency 'tilt',      '~> 1.3'
   gem.add_runtime_dependency 'railties'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+
+  gem.required_ruby_version = ">= 1.9.2"
 end