diff --git a/CHANGES.md b/CHANGES.md index 6d395e4..8793146 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,7 @@ +## v0.6.0 2015-07-06 22:36:25+0300 + +* Updated version to 0.6.0 for using Typescript source 1.4.1.3 + ## v0.5.0 2015-03-25 10:46:29+0900 * Expire root TS cache in response to change in referenced `.ts` files (#24) diff --git a/lib/typescript/rails/compiler.rb b/lib/typescript/rails/compiler.rb index a810777..9f7aa74 100644 --- a/lib/typescript/rails/compiler.rb +++ b/lib/typescript/rails/compiler.rb @@ -17,15 +17,13 @@ def replace_relative_references(ts_path, source) # 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| + (source.each_line.map do |l| if l.starts_with?('///') && !(m = %r!^///\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 - - output end # Get all references @@ -64,8 +62,5 @@ def compile(ts_path, source, context=nil, *options) end - self.default_options = [ - '--target', 'ES5', - '--noImplicitAny' - ] + self.default_options = %w(--target ES5 --noImplicitAny) end diff --git a/lib/typescript/rails/version.rb b/lib/typescript/rails/version.rb index 61cfadb..afbde79 100644 --- a/lib/typescript/rails/version.rb +++ b/lib/typescript/rails/version.rb @@ -1,5 +1,5 @@ module Typescript module Rails - VERSION = '0.5.0' + VERSION = '0.6.0' end end diff --git a/test/assets_test.rb b/test/assets_test.rb index 4c6f346..951b803 100644 --- a/test/assets_test.rb +++ b/test/assets_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require File.join(File.dirname(__FILE__), 'test_helper.rb') require 'typescript-rails' require "action_controller/railtie" @@ -35,14 +35,14 @@ def assets @app.assets end - test "typescript.js is included in Sprockets environment" do - assert { assets["typescript"].pathname.to_s.end_with?('/lib/assets/javascripts/typescript.js.erb') } - assert { assets["typescript"].body.include?('var TypeScript') } + test 'typescript.js is included in Sprockets environment' do + assert { assets["typescript"].filename.to_s.end_with?('/lib/assets/javascripts/typescript.js.erb') } + assert { assets["typescript"].source.include?('var ts;') } end - test "assets .js.ts is compiled from TypeScript to JavaScript" do + 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!";') } + assert { assets["javascripts/hello"].source.include?('var log_to_console = function (x) {') } + assert { assets["javascripts/hello"].source.include?('var s = "Hello, world!";') } end end \ No newline at end of file diff --git a/typescript-rails.gemspec b/typescript-rails.gemspec index 7b00c24..ba4994a 100644 --- a/typescript-rails.gemspec +++ b/typescript-rails.gemspec @@ -5,23 +5,23 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require 'typescript/rails/version' Gem::Specification.new do |gem| - gem.name = "typescript-rails" + gem.name = 'typescript-rails' gem.version = Typescript::Rails::VERSION gem.platform = Gem::Platform::RUBY - gem.authors = ["FUJI, Goro", "Klaus Zanders"] - gem.email = ["gfuji@cpan.org", "klaus.zanders@gmail.com"] + gem.authors = ['FUJI, Goro', 'Klaus Zanders'] + gem.email = %w(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 = "https://github.com/typescript-ruby/typescript-rails" + gem.homepage = 'https://github.com/typescript-ruby/typescript-rails' - gem.add_runtime_dependency 'typescript-node', '>= 1.1.0' + gem.add_runtime_dependency 'typescript-node', '>= 1.4.1' gem.add_runtime_dependency 'tilt' 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.require_paths = ['lib'] - gem.required_ruby_version = ">= 2.0.0" + gem.required_ruby_version = '>= 2.0.0' end