typescript-rails 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d716f7abc650659d6d0265678a5a085144c53106
-  data.tar.gz: dc6a563215325cec71abfab77557f64835cb6fb4
+  metadata.gz: ff9a4a7b974ccde9082b7c16c4f9e04dca61e1b6
+  data.tar.gz: d92a70618cf4472c5668263d520457576c88ced6
 SHA512:
-  metadata.gz: 13286cd68dc352b52e6822aa36999fa9499492dcd7c3d98d7bcbe42c15cc70e49e3af5222f5df748aa58cb640e5e4f5e367157c11fcab8defc8c511d299f32c7
-  data.tar.gz: 5ce4c3dc47c79cc660fc911b6d8573a71abb2496e33324d1c1e05606ea74865298715383979b778193f7004750a1a20fb585eafd3e0e65596557995f5c4c63cd
+  metadata.gz: 92e08dbe08a9bb5216bd9a0d8f7fe6b77e7ede6787d88e0724d065eeea717b00b826e4233a810c6de4887161cb5d96c37e2d556e72cb8466a7407e095597d3fd
+  data.tar.gz: e1f9344a67a40b4fc78241f230da8d9ea4dec2a73d2ba4b9610c6e3fd3ae2c8a0b2ffb6371ec9b0028d40b80792689e3a1f18c3467585d340f64b20a0aec4a79

data/CHANGES.md

@@ -1,3 +1,7 @@
+## v0.5.0 2015-03-25 10:46:29+0900
+
+* Expire root TS cache in response to change in referenced `.ts` files (#24)
+
 ## v0.4.2 2014-11-26 07:30:12+0900
 
 * Fix newlines (#15)

data/Gemfile

@@ -5,6 +5,7 @@ gemspec
 
 group :test do
   gem 'rails', '~> 4.0'
+  gem 'sprockets-rails', '> 2.0'
   gem 'minitest-power_assert'
   gem 'coveralls'
   gem 'simplecov'

data/README.md

@@ -43,6 +43,9 @@ Configurations:
 Typescript::Rails::Compiler.default_options = [ ... ]
 ```
 
+## Referenced TypeScript dependencies
+
+`typescript-rails` recurses through all [TypeScript-style](https://github.com/teppeis/typescript-spec-md/blob/master/en/ch11.md#1111-source-files-dependencies) referenced files and tells its [`Sprockets::Context`](https://github.com/sstephenson/sprockets/blob/master/lib/sprockets/context.rb) that the TS file being processed [`depend`s`_on`](https://github.com/sstephenson/sprockets#the-depend_on-directive) each file listed as a reference. This activates Sprocket’s cache-invalidation behavior when any of the descendant references of the root TS file is changed.
 
 ## Contributing
 

data/lib/typescript/rails/compiler.rb

@@ -18,8 +18,9 @@ module Typescript::Rails::Compiler
       # 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.map 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]))
+        if l.starts_with?('///') && !(m = %r!^///\s*<reference\s+path=(?:"([^"]+)"|'([^']+)')\s*/>\s*!.match(l)).nil?
+          matched_path = m.captures.compact[0]
+          l = l.sub(matched_path, File.join(escaped_dir, matched_path))
         end
         next l
       end).join
@@ -27,10 +28,36 @@ module Typescript::Rails::Compiler
       output
     end
 
+    # Get all references
+    #
+    # @param [String] path Source .ts path
+    # @param [String] source. It might be pre-processed by erb.
+    # @yieldreturn [String] matched ref abs_path
+    def get_all_reference_paths(path, source, visited_paths=Set.new, &block)
+      visited_paths << path
+      source ||= File.read(path)
+      source.each_line do |l|
+        if l.starts_with?('///') && !(m = %r!^///\s*<reference\s+path=(?:"([^"]+)"|'([^']+)')\s*/>\s*!.match(l)).nil?
+          matched_path = m.captures.compact[0]
+          abs_matched_path = File.expand_path(matched_path, File.dirname(path))
+          unless visited_paths.include? abs_matched_path
+            block.call abs_matched_path
+            get_all_reference_paths(abs_matched_path, nil, visited_paths, &block)
+          end
+        end
+      end
+    end
+
     # @param [String] ts_path
     # @param [String] source TypeScript source code
+    # @param [Sprockets::Context] sprockets context object
     # @return [String] compiled JavaScript source code
-    def compile(ts_path, source, *options)
+    def compile(ts_path, source, context=nil, *options)
+      if context
+        get_all_reference_paths(File.expand_path(ts_path), source) do |abs_path|
+          context.depend_on abs_path
+        end
+      end
       s = replace_relative_references(ts_path, source)
       ::TypeScript::Node.compile(s, *default_options, *options)
     end

data/lib/typescript/rails/template.rb

@@ -21,8 +21,8 @@ class Typescript::Rails::Template < ::Tilt::Template
     end
   end
 
-  def evaluate(scope, locals, &block)
-    @output ||= ::Typescript::Rails::Compiler.compile(file, data)
+  def evaluate(context, locals, &block)
+    @output ||= ::Typescript::Rails::Compiler.compile(file, data, context)
   end
 
   # @override

data/lib/typescript/rails/version.rb

@@ -1,5 +1,5 @@
 module Typescript
   module Rails
-    VERSION = '0.4.2'
+    VERSION = '0.5.0'
   end
 end

data/test/assets_test.rb

@@ -42,6 +42,7 @@ class AssetsTest < ActiveSupport::TestCase
 
   test "assets .js.ts is compiled from TypeScript to JavaScript" do
     assert { assets["javascripts/hello"].present? }
+    assert { assets["javascripts/hello"].send(:dependency_paths).map(&:pathname).map(&:to_s).include? File.expand_path("#{File.dirname(__FILE__)}/fixtures/assets/javascripts/included.ts") }
     assert { assets["javascripts/hello"].body.include?('var s = "Hello, world!";') }
   end
 end

data/test/fixtures/assets/javascripts/hello.js.ts

@@ -1,2 +1,3 @@
+/// <reference path="reference.ts" />
 var s: string = "Hello, world!";
-console.log(s)
+log_to_console(s);

data/test/fixtures/assets/javascripts/included.ts

@@ -0,0 +1,4 @@
+/// <reference path="reference.ts" />
+var log_to_console = function(x: string): void {
+  console.log(x)
+}

data/test/fixtures/assets/javascripts/reference.ts

@@ -0,0 +1,2 @@
+/// <reference path="hello.js.ts" />
+/// <reference path="included.ts" />

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typescript-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - FUJI, Goro
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typescript-node
@@ -80,6 +80,8 @@ files:
 - lib/typescript/rails/version.rb
 - test/assets_test.rb
 - test/fixtures/assets/javascripts/hello.js.ts
+- test/fixtures/assets/javascripts/included.ts
+- test/fixtures/assets/javascripts/reference.ts
 - test/fixtures/routes.rb
 - test/fixtures/site/es5.js.ts
 - test/fixtures/site/index.js.ts
@@ -112,13 +114,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Adds Typescript to the Rails Asset pipeline
 test_files:
 - test/assets_test.rb
 - test/fixtures/assets/javascripts/hello.js.ts
+- test/fixtures/assets/javascripts/included.ts
+- test/fixtures/assets/javascripts/reference.ts
 - test/fixtures/routes.rb
 - test/fixtures/site/es5.js.ts
 - test/fixtures/site/index.js.ts