typescript-rails 0.1.2 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Nzg4NDc0YzU3NGViY2NiMjk4Y2JmMGQzN2MzZTQ0Yjc4MGI4Y2RkNA==
-  data.tar.gz: !binary |-
-    NGYyY2I2NjAwOTEyZDVmODUzMjE2MTQ2Y2VhOTQ1NDBkOWI5ZTcyMQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NDEzNGQ1YjU4NDVkNDI0NDcwZDZjZDc3MDk4MzFjMTkxMDgyMGQ1YjZkZjA5
-    MGUzM2JkNGVlMjhkNjgxYjEwNTAyMzE5ZjUxY2M4NjljYWM4NzBmMTdlYTcy
-    NTllN2NkOGM0ZmU2YzVhZGQxMGNlNzVhNzRmYTVjYzljMGQxNzk=
-  data.tar.gz: !binary |-
-    NWU2OTUwMmE3MDRkZDdmMzBlNjExYmRlY2QyMjliZDYyZmUxNzljZDg3ZDE3
-    NDFmM2NhNWI1Yjc4YjgwZWZiNzllMjYxYmFiMjkzNjdmMDVmNWFiNGQzYWZi
-    ZTFlZjIyZGUxMGVmZTY5NzFkM2Q0MDNiOTYwMjY1MGFlMmIzMTM=
+SHA1:
+  metadata.gz: f5d77f08721b8681ce68d5aedb9dc14926de34fc
+  data.tar.gz: 2f96be0c4b65b5ede9f1ef812e488511401469f5
+SHA512:
+  metadata.gz: 5672c91a06cf89f43577e5d0a8d43fdf5bd88866b54e85607b45c222fdfb4bc125bffa83fc814e8270826a4e533f5f6fb3aabb18d36d60b3c6bdd37dcb4c9ab9
+  data.tar.gz: 9826e185b8e56e55fcbdb61cb2ed46b2330dab8764655a766107dcd7340b7e3e6c143e7a2ca80c2af9ccac5988eb5c97fcbad4a1b533b721ef9eb611e7ce4684

data/.gitignore

@@ -1,3 +1,4 @@
+.idea/*
 *.gem
 *.rbc
 .bundle

data/.travis.yml

@@ -1,12 +1,11 @@
 rvm:
- - 1.9.2
  - 1.9.3
- - ree
+ - 2.0.0
+ - 2.1.0
  - jruby
- - rbx
+notifications:
+  email: false
 script: bundle exec rake test
 matrix:
   allow_failures:
-    - rvm: rbx 
-    - rvm: ree
     - rvm: jruby

data/Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in typescript-rails.gemspec
 gemspec
 
-gem 'rails', '~> 3.2.0'
+gem 'rails', '~> 4.0'

data/README.md

@@ -1,4 +1,4 @@
-# TypeScript for Rails [![Build Status](https://travis-ci.org/klaustopher/typescript-rails.png?branch=master)](https://travis-ci.org/klaustopher/typescript-rails)
+# TypeScript for Rails [![Build Status](https://travis-ci.org/typescript-rails/typescript-rails.svg?branch=master)](https://travis-ci.org/typescript-rails/typescript-rails)
 
 This is a wrapper for the [TypeScript](http://www.typescriptlang.org/) JavaScript superset language by Microsoft.
 
@@ -33,6 +33,7 @@ And then execute:
     $ bundle
 
 ## Usage
+
 Just add a `.js.ts` file in your `app/assets/javascripts` directory and include it just like you are used to do.
 
 ## Contributing
@@ -42,3 +43,12 @@ Just add a `.js.ts` file in your `app/assets/javascripts` directory and include
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Maintainers
+
+FUJI Goro <gfuji@cpan.org>
+
+## Authors
+
+Klaus Zanders <klaus.zanders@gmail.com>
+

data/lib/typescript/rails/railtie.rb

@@ -4,7 +4,7 @@ module Typescript
       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

data/lib/typescript/rails/template_handler.rb

@@ -41,7 +41,8 @@ module Typescript
       end
 
       def evaluate(scope, locals, &block)
-        @output ||= TypeScript::Node.compile(data)
+        source = Typescript::Rails.replace_relative_references(file, data)
+        @output ||= TypeScript::Node.compile(source)
       end
 
       def allows_script?
@@ -57,9 +58,39 @@ module Typescript
 
       def self.call(template)
         compiled_source = erb_handler.call(template)
-        "TypeScript::Node.compile(begin;#{compiled_source};end)"
+        escaped_path = template.identifier.gsub(/['\\]/, '\\\\\&') # "'" => "\\'", '\\' => '\\\\'
+        <<-EOS
+        TypeScript::Node.compile(
+          Typescript::Rails.replace_relative_references(
+            '#{escaped_path}', (begin;#{compiled_source};end)
+          )
+        )
+        EOS
       end
     end
+
+    # Replace relative paths specified in /// <reference path="..." /> with absolute paths.
+    #
+    # @param [String] ts_path Source .ts path
+    # @param [String] ts source. It might be pre-processed by erb.
+    # @return [String] replaces source
+    def self.replace_relative_references(ts_path, source)
+      ts_dir = File.dirname(File.expand_path(ts_path))
+      escaped_dir = ts_dir.gsub(/["\\]/, '\\\\\&') # "\"" => "\\\"", '\\' => '\\\\'
+
+      # 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
 

data/lib/typescript/rails/version.rb

@@ -1,5 +1,5 @@
 module Typescript
   module Rails
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

data/test/support/site/ref1_2.js.ts

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

data/test/support/site/ref2_1.d.ts

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

data/test/support/site/ref2_2.js.ts

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

data/test/support/site/ref3_1.js.ts

@@ -0,0 +1,5 @@
+/// <reference path="ref3_2.ts" />
+/// <reference path="ref3_3.ts" />
+
+f1();
+f2();

data/test/support/site/ref3_2.ts

@@ -0,0 +1,3 @@
+var f1 = function() {
+
+};

data/test/support/site/ref3_3.ts

@@ -0,0 +1,3 @@
+var f2 = function() {
+
+};

data/test/template_handler_test.rb

@@ -13,6 +13,7 @@ DummyApp.draw do
   get "site/ref1_2"
   get "site/ref2_1"
   get "site/ref2_2"
+  get "site/ref3_1"
 end
 
 class TemplateHandlerTest < ActiveSupport::TestCase
@@ -22,20 +23,33 @@ class TemplateHandlerTest < ActiveSupport::TestCase
     @app ||= DummyApp
   end
 
+  def source
+    # source without comments
+    last_response.body.gsub(%r{^//[^\n]*}m, '')
+  end
+
   test "typescript views are served as javascript" do
     get "/site/index.js"
-
-    assert_match "var x = 5;\r\n", last_response.body
+    assert_match /var x = 5;\s*/,
+        source
   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*/,
+        source
   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*/,
+        source
+  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\(\);/,
+        source
   end
 
 end

data/typescript-rails.gemspec

@@ -8,16 +8,16 @@ Gem::Specification.new do |gem|
   gem.name          = "typescript-rails"
   gem.version       = Typescript::Rails::VERSION
   gem.platform      = Gem::Platform::RUBY
-  gem.authors       = ["Klaus Zanders"]
-  gem.email         = ["klaus.zanders@gmail.com"]
+  gem.authors       = ["FUJI, Goro", "Klaus Zanders"]
+  gem.email         = ["gfuji@cpan.org", "klaus.zanders@gmail.com"]
   gem.description   = %q{Adds Typescript to the Rails Asset pipeline}
   gem.summary       = %q{Adds Typescript to the Rails Asset pipeline}
-  gem.homepage      = "http://github.com/klaustopher/typescript-rails"
+  gem.homepage      = "https://github.com/typescript-rails/typescript-rails"
 
   gem.rubyforge_project = "typescript-rails"
 
-  gem.add_runtime_dependency 'typescript-node', '~> 0.0'
-  gem.add_runtime_dependency 'tilt',      '~> 1.3'
+  gem.add_runtime_dependency 'typescript-node'
+  gem.add_runtime_dependency 'tilt'
   gem.add_runtime_dependency 'railties'
 
   gem.files         = `git ls-files`.split($/)
@@ -25,5 +25,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 1.9.2"
+  gem.required_ruby_version = ">= 1.9.3"
 end

metadata

@@ -1,66 +1,68 @@
 --- !ruby/object:Gem::Specification
 name: typescript-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
+- FUJI, Goro
 - Klaus Zanders
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typescript-node
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Adds Typescript to the Rails Asset pipeline
 email:
+- gfuji@cpan.org
 - klaus.zanders@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -78,10 +80,13 @@ files:
 - test/support/site/ref1_2.js.ts
 - test/support/site/ref2_1.d.ts
 - test/support/site/ref2_2.js.ts
+- test/support/site/ref3_1.js.ts
+- test/support/site/ref3_2.ts
+- test/support/site/ref3_3.ts
 - test/template_handler_test.rb
 - test/test_helper.rb
 - typescript-rails.gemspec
-homepage: http://github.com/klaustopher/typescript-rails
+homepage: https://github.com/typescript-rails/typescript-rails
 licenses: []
 metadata: {}
 post_install_message: 
@@ -90,17 +95,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: typescript-rails
-rubygems_version: 2.0.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Adds Typescript to the Rails Asset pipeline
@@ -112,5 +117,8 @@ test_files:
 - test/support/site/ref1_2.js.ts
 - test/support/site/ref2_1.d.ts
 - test/support/site/ref2_2.js.ts
+- test/support/site/ref3_1.js.ts
+- test/support/site/ref3_2.ts
+- test/support/site/ref3_3.ts
 - test/template_handler_test.rb
 - test/test_helper.rb