skim 0.9.0 → 0.11.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: be0b29f6955ce76137070ba09b3472195a065c2d773aee16e29c0876cb167d46
+  data.tar.gz: 708c7d0a475fdfdebb68aea3736aa8c71ad0defdeaa05cf63fe350095cb84e42
+SHA512:
+  metadata.gz: 22f31e4516bc4742782dac10a29799105855c3d02e4ef92e8b05cb7c6ec4240e5d09798ecb13d635b7812896eba856b49d70ac3c040f9ab6f51c2b33492104e8
+  data.tar.gz: 13697db4450022d4195a9093827b6d160893c90c688cfd5c30a003604e4b415dece32cf94d7595e9496d9d839bcb96510a13f1c452c809469f963381b5c14217

data/.gitignore

@@ -15,4 +15,3 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-bin

data/.ruby-version

@@ -0,0 +1 @@
+2.6.6

data/.travis.yml

@@ -1,3 +1,4 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.6.6
+sudo: false

data/History.md

@@ -1,5 +1,30 @@
 # master
 
+# 0.11.0
+
+* Add skim command-line interface
+* Compatibility with Rails 6 and Sprockets 4
+* Fix "Syntax Error: Unexpected &" bug (#48) -- thanks to @pavelkomiagin!
+* Update README with CLI documentation and new copyright notice
+* Update LICENSE for new maintainership
+* Upgrade Travis infrastructure
+
+# 0.10.0
+
+* Compatibility with Rails 4.2, Slim 3, and Sprockets 3
+
+# 0.9.3
+
+* Manually append assets path if Rails not available (#33)
+
+# 0.9.2
+
+* Performance improvements
+
+# 0.9.1
+
+* Fix 'SyntaxError: unexpected LOGIC' bug (#30)
+
 # 0.9.0
 
 * Now uses/requires slim 2.0.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 John Firebaugh
+Copyright (c) 2012 John Firebaugh, (c) 2015 AppJudo Inc.
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,21 +1,18 @@
-Skim [ ![Build status](https://travis-ci.org/jfirebaugh/skim.png) ](https://travis-ci.org/jfirebaugh/skim)
+Skim [ ![Build status](https://travis-ci.org/appjudo/skim.png) ](https://travis-ci.org/appjudo/skim)
 ====
 
 Take the fat out of your client-side templates with Skim. Skim is the [Slim](http://slim-lang.com/) templating engine
 with embedded CoffeeScript. It compiles to JavaScript templates (`.jst`), which can then be served by Rails or any other
 Sprockets-based asset pipeline.
 
-# Usage
+# Install
 
-`gem install skim`, or add `skim` to your `Gemfile` in the `:assets` group:
+`gem install skim`, or add `skim` to your `Gemfile`.
 
-```ruby
-group :assets do
-  gem 'skim'
-end
-```
+# Usage
 
-Create template files with the extension `.jst.skim`. For example, `test.jst.skim`:
+Create template files with the extension
+`.jst.skim`. For example, `test.jst.skim`:
 
 ```jade
 p Hello #{@world}!
@@ -27,16 +24,38 @@ In your JavaScript or CoffeeScript, render the result, passing a context object:
 $("body").html(JST["test"]({world: "World"}));
 ```
 
-Order up a skinny latte and enjoy!
+## Command Line Interface
+
+The CLI allows Skim to be used in Gulp and Grunt workflows, extending the reach of Skim from the Ruby world into the JS/ES/CoffeeScript communities.
+
+Features:
+- Options to output Skim asset and templates separately.
+- Options to assign template function to `module.exports`, a global function variable, or a global object (keyed by filename, as Sprockets does with its `JST` object).
+
+Usage: `skim [options]`
+
+```
+-s, --stdin                      Read input from standard input instead of an input file
+-e, --export                     Assign to module.exports for CommonJS require
+-n, --node-global                Use Node.js global object for global assignments
+    --jst                        Assign to global JST object keyed by truncated filename
+    --assign variableName        Assign to a global variable
+    --assign-object objectName   Assign to a global object keyed by truncated filename
+    --asset-only                 Output only the Skim preamble asset
+    --omit-asset                 Omit Skim preamble asset from output
+    --trace                      Show a full traceback on error
+-o, --option name=code           Set skim option
+-r, --require library            Load library or plugin
+-h, --help                       Show this help message
+-v, --version                    Print version number
+```
 
 # Caveats
 
 Skim is an early proof-of-concept. Some Slim features are still missing:
 
-* Skim does not currently support embedded engines. Being a client-side templating languages, it will only be able to
-  support embedded engines with a client-side implementation.
-* Skim does not currently support HTML pretty-printing (Slim's `:pretty` option). This is low priority, as
-  pretty-printing is even less important client-side than server-side.
+* Skim does not currently support embedded engines. Being a client-side templating languages, it will only be able to support embedded engines with a client-side implementation.
+* Skim does not currently support HTML pretty-printing (Slim's `:pretty` option). This is low priority, as pretty-printing is even less important client-side than server-side.
 * Skim does not currently support backslash line continuations.
 
 # Language reference
@@ -60,16 +79,17 @@ string.
 * You will typically want to use the fat arrow `=>` function definition to create callbacks, to preserve the binding of
 `this` analogously to how `self` behaves in a Ruby block.
 
-## The context object
+## The Context Object
 
 The context object you pass to the compiled template function becomes the value of this inside your template. You can
 use CoffeeScript's `@` sigil to easily access properties and call helper methods on the context object.
 
-## Escaping and unescaping
+## Escaping and Unescaping
 
 Like Slim, Skim escapes dynamic output by default, and it supports the same `==` and `#{{}}` syntaxes for bypassing
 escaping. In addition, the special `safe` method on the context object tells Skim that the string can be output without
 being escaped. You can use this in conjunction with `escape` context method to selectively sanitize parts of the string.
+
 For example, given the template:
 
 ```jade
@@ -93,7 +113,7 @@ to produce:
 <a href='/projects/4'>Crate &amp; Barrel</a>
 ```
 
-## The Skim asset
+## The Skim Asset
 
 By default, all you need to do to start using Skim is add it to your Gemfile. Skim will embed a small amount of
 supporting code in each generated template asset. You can remove this duplication by manually including Skim's asset,
@@ -111,9 +131,17 @@ And the following in an initializer:
 Skim::Engine.default_options[:use_asset] = true
 ```
 
+Skim templates also support dependency injection for the Skim asset, instead of using a global Skim variable. Example in Node.js:
+
+```js
+var Skim = require('./skim_asset_module.js')
+var template = require('./template_module.js');
+console.log(template({Skim: Skim, first_name: 'Dave', last_name: 'Smith'}));
+```
+
 # License (MIT)
 
-Copyright (c) 2012 John Firebaugh
+Copyright (c) 2012 John Firebaugh, (c) 2015 AppJudo Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -136,6 +164,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 # Special Thanks
 
+* John Firebaugh, for creating Skim
 * Andrew Stone, for Slim
 * Magnus Holm, for Temple
-* Daniel Mendler, for maintenance of both
+* Daniel Mendler, for maintenance of Slim and Temple

data/bin/skim

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.dirname(__FILE__) + '/../lib'
+require 'skim/command'
+
+Skim::Command.new(ARGV).run

data/lib/skim.rb

@@ -9,8 +9,5 @@ require "skim/engine"
 require "skim/template"
 require "skim/version"
 
-require "skim/rails" if Object.const_defined?(:Rails)
-
-require "sprockets"
-Sprockets::Engines # force autoload
-Sprockets.register_engine ".skim", Skim::Template
+require "skim/rails" if defined?(Rails::Engine)
+require "skim/sprockets"

data/lib/skim/command.rb

@@ -0,0 +1,141 @@
+require 'skim'
+require 'optparse'
+
+module Skim
+  class Command
+    def initialize(args)
+      @args = args
+      @options = {}
+    end
+
+    # Run command
+    def run
+      @opts = OptionParser.new(&method(:set_opts))
+      @opts.parse!(@args)
+      process
+    end
+
+    private
+
+    # Configure OptionParser
+    def set_opts(opts)
+      opts.on('-s', '--stdin', 'Read input from standard input instead of an input file') do
+        @input = $stdin
+      end
+
+      opts.on('-e', '--export', 'Assign to module.exports for CommonJS require') do
+        @export = true
+      end
+
+      opts.on('-n', '--node-global', 'Use Node.js global object for global assignments') do
+        @node_global = true
+      end
+
+      opts.on('--jst', 'Assign to global JST object keyed by truncated filename') do
+        @assign_object_name = 'JST'
+      end
+
+      opts.on('--assign variableName', 'Assign to a global variable') do |str|
+        @assign_variable_name = str
+      end
+
+      opts.on('--assign-object objectName', 'Assign to a global object keyed by truncated filename') do |str|
+        @assign_object_name = str
+      end
+
+      opts.on('--asset-only', 'Output only the Skim preamble asset') do
+        @asset_only = true
+      end
+
+      opts.on('--omit-asset', 'Omit Skim preamble asset from output') do
+        @options[:use_asset] = true
+      end
+
+      opts.on('--trace', 'Show a full traceback on error') do
+        @trace = true
+      end
+
+      opts.on('-o', '--option name=code', String, 'Set skim option') do |str|
+        parts = str.split('=', 2)
+        Engine.options[parts.first.gsub(/\A:/, '').to_sym] = eval(parts.last)
+      end
+
+      opts.on('-r', '--require library', "Load library or plugin") do |lib|
+        require lib.strip
+      end
+
+      opts.on_tail('-h', '--help', 'Show this help message') do
+        puts opts
+        exit
+      end
+
+      opts.on_tail('-v', '--version', 'Print version number') do
+        puts "Skim #{VERSION}"
+        exit
+      end
+    end
+
+    # Process command
+    def process
+      args = @args.dup
+      result = if @asset_only
+        CoffeeScript.compile(Skim::Template.skim_src)
+      else
+        unless @input
+          filename = args.shift
+          if filename
+            @filename = filename
+            @input = File.open(filename, 'r')
+          else
+            @filename = 'STDIN'
+            @input = $stdin
+          end
+        end
+
+        locals = @options.delete(:locals) || {}
+        Template.new(@filename, @options) { @input.read }.render(nil, locals)
+      end
+
+      result = prepend_assignment(result)
+
+      rescue Exception => ex
+        raise ex if @trace || SystemExit === ex
+        $stderr.print "#{ex.class}: " if ex.class != RuntimeError
+        $stderr.puts ex.message
+        $stderr.puts '  Use --trace for backtrace.'
+        exit 1
+      else
+        unless @options[:output]
+          filename = args.shift
+          @options[:output] = filename ? File.open(filename, 'w') : $stdout
+        end
+        @options[:output].puts(result)
+        exit 0
+    end
+
+    def prepend_assignment(result)
+      assignment = ''
+      initialization = ''
+
+      global = 'this'
+      if @node_global
+        global = 'global'
+        result.sub!(/(this)(\.Skim =)/) {"#{global}#{$2}"}
+      end
+
+      assignment += "module.exports = " if @export
+      assignment += "#{global}.#{@assign_variable_name} = " if @assign_variable_name
+      if @assign_object_name
+        object_name = "#{global}.#{@assign_object_name}"
+        initialization = "#{object_name} || (#{object_name} = {});\n"
+        assignment += "#{object_name}[#{truncated_filename.inspect}] = "
+      end
+
+      assignment.empty? ? result : (initialization + assignment + result)
+    end
+
+    def truncated_filename
+      @filename.sub(/\.[^#{File::SEPARATOR}]*\Z/, '')
+    end
+  end
+end

data/lib/skim/engine.rb

@@ -14,25 +14,25 @@ module Skim
                    :default_tag => 'div',
                    :use_asset => false
 
-    filter :Encoding, :encoding
+    filter :Encoding
     filter :RemoveBOM
-    use Slim::Parser, :file, :tabsize, :shortcut, :default_tag
-    use Slim::Embedded, :enable_engines, :disable_engines, :pretty
+    use Slim::Parser
+    use Slim::Embedded
     use Skim::Interpolation
-    use Slim::Splat::Filter, :merge_attrs, :attr_quote, :sort_attrs, :default_tag, :hyphen_attrs
-    use Skim::Controls, :disable_capture
-    html :AttributeSorter, :sort_attrs
-    html :AttributeMerger, :merge_attrs
-    use Skim::CodeAttributes, :merge_attrs
+    use Slim::Splat::Filter
+    use Skim::Controls
+    html :AttributeSorter
+    use Temple::CoffeeScript::AttributeMerger
+    use Skim::CodeAttributes
     use(:AttributeRemover) { Temple::CoffeeScript::AttributeRemover.new(:remove_empty_attrs => options[:merge_attrs].keys)}
-    html :Pretty, :format, :attr_quote, :pretty, :indent, :js_wrapper
-    use Temple::HTML::Fast, :format, :attr_quote
-    use Temple::CoffeeScript::Filters::Escapable, :use_html_safe, :disable_escape
+    html :Pretty
+    use Temple::HTML::Fast
+    use Temple::CoffeeScript::Filters::Escapable
     use Temple::CoffeeScript::Filters::ControlFlow
     filter :MultiFlattener
     use(:Optimizer) { Temple::Filters::StaticMerger.new }
     use :Generator do
-      options[:generator].new(options.to_hash.reject {|k,v| !options[:generator].default_options.valid_keys.include?(k) })
+      options[:generator].new(options.to_hash.reject {|k,v| !options[:generator].options.valid_keys.include?(k) })
     end
   end
 end

data/lib/skim/sprockets.rb

@@ -0,0 +1,16 @@
+require "sprockets"
+
+if Sprockets.respond_to?(:register_transformer)
+  Sprockets.register_mime_type 'text/skim', extensions: ['.skim', '.jst.skim'], charset: :unicode
+  Sprockets.register_transformer 'text/skim', 'application/javascript+function', Skim::Template
+end
+
+if Sprockets.respond_to?(:register_engine)
+  args = ['.skim', Skim::Template]
+  args << { mime_type: 'application/javascript', silence_deprecation: true } if Sprockets::VERSION.start_with?('3')
+  Sprockets.register_engine(*args)
+end
+
+unless defined?(Rails::Engine)
+  Sprockets.append_path File.expand_path('../../../vendor/assets/javascripts', __FILE__)
+end

data/lib/skim/template.rb

@@ -6,6 +6,14 @@ module Skim
   class Template
     self.default_mime_type = "application/javascript"
 
+    def self.call(input)
+      source   = input[:data]
+      context  = input[:environment].context_class.new(input)
+
+      result = new { source }.render
+      context.metadata.merge(data: result)
+    end
+
     def coffee_script_src
 
       engine = Engine.new(options.merge({
@@ -17,7 +25,7 @@ module Skim
 <<-SRC
 #{self.class.skim_src unless engine.options[:use_asset]}
 return (context = {}) ->
-  Skim.withContext.call {}, context, ->
+  (context.Skim || Skim).withContext.call {}, context, ->
 #{src}
 SRC
     end

data/lib/skim/version.rb

@@ -1,3 +1,3 @@
 module Skim
-  VERSION = "0.9.0"
+  VERSION = "0.11.0"
 end

data/lib/temple/coffee_script/generators.rb

@@ -7,10 +7,7 @@ module Temple
 
       def call(exp)
         @indent = options[:indent]
-        compile [:multi,
-                 [:code, "#{buffer} = []"],
-                 exp,
-                 [:code, "#{buffer}.join('')"]]
+        compile [:multi, [:code, "#{buffer} = ''"], exp, [:code, "#{buffer}"]]
       end
 
       def on_multi(*exp)
@@ -41,7 +38,7 @@ module Temple
       end
 
       def concat(str)
-        indent("#{buffer}.push(#{str})")
+        indent "#{buffer} += #{str}"
       end
 
       def indent(str, indent = @indent)

data/skim.gemspec

@@ -2,29 +2,31 @@
 require File.expand_path('../lib/skim/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["John Firebaugh"]
-  gem.email         = ["john.firebaugh@gmail.com"]
+  gem.authors       = ['AppJudo Inc.']
+  gem.email         = ['info@appjudo.com']
   gem.description   = %q{Fat-free client-side templates with Slim and CoffeeScript}
   gem.summary       = %q{Take the fat out of your client-side templates with Skim. Skim is the Slim templating engine
 with embedded CoffeeScript. It compiles to JavaScript templates (.jst), which can then be served by Rails or any other
 Sprockets-based asset pipeline.}
-  gem.homepage      = ""
+  gem.homepage      = ''
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
+  gem.executables   = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name          = "skim"
-  gem.require_paths = ["lib"]
+  gem.name          = 'skim'
+  gem.require_paths = ['lib']
   gem.version       = Skim::VERSION
+  gem.license       = 'MIT'
 
-  gem.add_dependency "slim", "~> 2.0.0"
+  gem.add_dependency "slim", '>= 3.0'
   gem.add_dependency "coffee-script"
   gem.add_dependency "coffee-script-source", ">= 1.2.0"
-  gem.add_dependency "sprockets"
+  gem.add_dependency "sprockets", ">= 2.0", "< 5.0"
 
   gem.add_development_dependency "rake"
+  gem.add_development_dependency "pry"
   gem.add_development_dependency "execjs"
-  gem.add_development_dependency "minitest-reporters", "~> 0.10"
-  gem.add_development_dependency "therubyracer"
-  gem.add_development_dependency "libv8", "3.11.8.3"
+  gem.add_development_dependency "minitest-reporters"
+  gem.add_development_dependency "libv8", "~> 8.4"
 end

data/test/helper.rb

@@ -1,9 +1,10 @@
 require "rubygems"
-require "minitest/unit"
+require "minitest/autorun"
 require "minitest/reporters"
 require "skim"
 require "coffee_script"
 require "execjs"
+require "pry"
 
 if ENV["RM_INFO"] || ENV["TEAMCITY_VERSION"]
   MiniTest::Reporters.use! MiniTest::Reporters::RubyMineReporter.new
@@ -11,9 +12,9 @@ else
   MiniTest::Reporters.use! MiniTest::Reporters::ProgressReporter.new
 end
 
-MiniTest::Unit.autorun
+Minitest.autorun
 
-class TestSkim < MiniTest::Unit::TestCase
+class TestSkim < Minitest::Test
   def context_source
     File.read(File.expand_path("../context.coffee", __FILE__))
   end
@@ -48,7 +49,7 @@ class TestSkim < MiniTest::Unit::TestCase
       "var template = #{compile(source, options)}",
       "var evaluate = function () { return template(context); }"
     ]
-    if Skim::Engine.default_options[:use_asset]
+    if Skim::Engine.options[:use_asset]
       code.unshift skim_source
     end
 
@@ -68,10 +69,10 @@ class TestSkim < MiniTest::Unit::TestCase
     yield
 
     begin
-      Skim::Engine.default_options[:use_asset] = true
+      Skim::Engine.options[:use_asset] = true
       yield
     ensure
-      Skim::Engine.default_options[:use_asset] = false
+      Skim::Engine.options[:use_asset] = false
     end
   end
 

data/test/test_attribute_merger.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestAttributeMerger < MiniTest::Unit::TestCase
+class TestAttributeMerger < Minitest::Test
   def call(expr)
     Temple::CoffeeScript::AttributeMerger.new.call(expr)
   end

data/test/test_code_blocks.rb

@@ -4,8 +4,7 @@ class TestSkimCodeBlocks < TestSkim
   def test_render_with_output_code_block
     source = %q{
 p
-  = @callback "Hello Ruby!", ->
-    | Hello from within a block!
+  = @callback "Hello Ruby!", -> 'Hello from within a block!'
 }
 
     assert_html '<p>Hello Ruby! Hello from within a block! Hello Ruby!</p>', source
@@ -14,8 +13,7 @@ p
   def test_render_with_output_code_within_block
     source = %q{
 p
-  = @callback "Hello Ruby!", =>
-    = @callback "Hello from within a block!"
+  = @callback "Hello Ruby!", => @callback "Hello from within a block!"
 }
 
     assert_html '<p>Hello Ruby! Hello from within a block! Hello Ruby!</p>', source
@@ -24,9 +22,7 @@ p
   def test_render_with_output_code_within_block_2
     source = %q{
 p
-  = @callback "Hello Ruby!", =>
-    = @callback "Hello from within a block!", =>
-      = @callback "And another one!"
+  = @callback "Hello Ruby!", => @callback "Hello from within a block!", => @callback "And another one!"
 }
 
     assert_html '<p>Hello Ruby! Hello from within a block! And another one! Hello from within a block! Hello Ruby!</p>', source
@@ -35,9 +31,7 @@ p
   def test_output_block_with_arguments
     source = %q{
 p
-  = @define_macro 'person', (first_name, last_name) =>
-    .first_name = first_name
-    .last_name = last_name
+  = @define_macro 'person', (first_name, last_name) => "<div class=\"first_name\">#{first_name}</div><div class=\"last_name\">#{last_name}</div>"
   == @call_macro 'person', 'John', 'Doe'
   == @call_macro 'person', 'Max', 'Mustermann'
 }
@@ -66,6 +60,15 @@ p
     assert_html '<p>Hey!Hey!Hey!</p>', source
   end
 
+  def test_render_with_control_code_for_in_loop_without_parent
+    source = %q{
+- for i in [0..2]
+  p Hey!
+}
+
+    assert_html '<p>Hey!</p><p>Hey!</p><p>Hey!</p>', source
+  end
+
   def test_render_with_control_code_for_own_of_loop
     source = %q{
 p
@@ -78,11 +81,26 @@ p
 
   def test_captured_code_block_with_conditional
     source = %q{
-= @callback "Hello Ruby!", ->
-  - if true
-    | Hello from within a block!
+= @callback "Hello Ruby!", -> 'Hello from within a block!' if true
 }
 
     assert_html 'Hello Ruby! Hello from within a block! Hello Ruby!', source
   end
-end
+
+  def test_attribute_merger
+    source = %q{
+.hello class='ruby' Hello Ruby!
+}
+
+    assert_html '<div class="hello ruby">Hello Ruby!</div>', source
+  end
+
+  def test_attribute_merger_with_not_static_class_attr
+    source = %q{
+- class_name = 'ruby'
+.hello class=class_name Hello Ruby!
+}
+
+    assert_html '<div class="hello ruby">Hello Ruby!</div>', source
+  end
+end

data/test/test_code_output.rb

@@ -13,7 +13,7 @@ p
   def test_render_with_trailing_whitespace
     source = %q{
 p
-  =' @hello_world()
+  => @hello_world()
 }
 
     assert_html '<p>Hello World from @env </p>', source
@@ -21,7 +21,7 @@ p
 
   def test_render_with_trailing_whitespace_after_tag
     source = %q{
-p=' @hello_world()
+p=> @hello_world()
 }
 
     assert_html '<p>Hello World from @env</p> ', source
@@ -30,7 +30,7 @@ p=' @hello_world()
   def test_no_escape_render_with_trailing_whitespace
     source = %q{
 p
-  ==' @hello_world()
+  ==> @hello_world()
 }
 
     assert_html '<p>Hello World from @env </p>', source
@@ -38,7 +38,7 @@ p
 
   def test_no_escape_render_with_trailing_whitespace_after_tag
     source = %q{
-p==' @hello_world()
+p==> @hello_world()
 }
 
     assert_html '<p>Hello World from @env</p> ', source

data/test/test_commands.rb

@@ -0,0 +1,203 @@
+# coding: utf-8
+require 'helper'
+require 'open3'
+require 'tempfile'
+
+class TestSkimCommands < Minitest::Test
+  # nothing complex
+  STATIC_TEMPLATE = "p Hello World!\n"
+
+  # requires a `name` variable to exist at render time
+  DYNAMIC_TEMPLATE = "p Hello \#{name}!\n"
+
+  # a more complex example
+  LONG_TEMPLATE = "h1 Hello\np\n  | World!\n  small Tiny text"
+
+  # exception raising example
+  INVALID_TEMPLATE = '- if true'
+
+  def test_option_help
+    out, err = exec_skim '--help'
+    assert err.empty?
+    assert_match /Show this help message/, out
+  end
+
+  def test_option_version
+    out, err = exec_skim '--version'
+    assert err.empty?
+    assert_match /\ASkim #{Regexp.escape Skim::VERSION}$/, out
+  end
+
+  def test_export
+    prepare_common_test STATIC_TEMPLATE, '--export' do |out, err|
+      assert err.empty?
+      assert_equal "<p>Hello World!</p>", evaluate_node(out, 'module.exports()')
+    end
+  end
+
+  def test_assign_variable
+    prepare_common_test STATIC_TEMPLATE, '--assign', 'myFunction' do |out, err|
+      assert err.empty?
+      assert_equal "<p>Hello World!</p>", evaluate(out, 'myFunction()')
+    end
+  end
+
+  def test_assign_object
+    with_tempfile STATIC_TEMPLATE do |in_file|
+      out, err = exec_skim '--assign-object', 'myObject', in_file
+      assert err.empty?
+      key = in_file.chomp(File.extname(in_file))
+      assert_equal "<p>Hello World!</p>", evaluate(out, "myObject[#{key.inspect}]()")
+    end
+  end
+
+  def test_jst
+    with_tempfile STATIC_TEMPLATE do |in_file|
+      out, err = exec_skim '--jst', in_file
+      assert err.empty?
+      key = in_file.chomp(File.extname(in_file))
+      assert_equal "<p>Hello World!</p>", evaluate(out, "JST[#{key.inspect}]()")
+    end
+  end
+
+  def test_node_global
+    prepare_common_test STATIC_TEMPLATE, '--node-global', '--assign', 'myFunction' do |out, err|
+      assert err.empty?
+      assert_match /global\.Skim/, out
+      assert_equal "<p>Hello World!</p>", evaluate_node(out, 'global.myFunction()')
+    end
+  end
+
+  def test_asset_only
+    out, err = exec_skim '--asset-only'
+    assert err.empty?
+    assert_match %r{withContext\: function}, out
+  end
+
+  def test_omit_asset
+    prepare_common_test STATIC_TEMPLATE, '--omit-asset' do |out, err|
+      assert err.empty?
+      refute_match %r{withContext\: function}, out
+    end
+  end
+
+  def test_require
+    with_tempfile 'puts "Not in skim"', 'rb' do |lib|
+      prepare_common_test STATIC_TEMPLATE, '--require', lib, stdin_file: false, file_file: false do |out, err|
+        assert err.empty?
+        assert_match %r{\ANot in skim\n}, out
+      end
+    end
+  end
+
+  def test_error
+    prepare_common_test INVALID_TEMPLATE, stdin_file: false do |out, err|
+      assert out.empty?
+      assert_match /SyntaxError/, err
+      assert_match /Use --trace for backtrace/, err
+    end
+  end
+
+  def test_trace_error
+    prepare_common_test INVALID_TEMPLATE, '--trace', stdin_file: false do |out, err|
+      assert out.empty?
+      assert_match /SyntaxError/, err
+      assert_match /bin\/skim/, err
+    end
+  end
+
+private
+
+  # Executes a test (given as block) four times:
+  #
+  # 1. Read from $stdin, write to $stdout
+  # 2. Read from file, write to $stdout
+  # 3. Read from $stdin, write to file
+  # 4. Read from file, write to file
+  #
+  # Each of the above test executions yields a tuple (out, err).
+  # Any args given are passed to the skim command (before input/output args).
+  def prepare_common_test(content, *args)
+    options = Hash === args.last ? args.pop : {}
+
+    # case 1. $stdin → $stdout
+    unless options[:stdin_stdout] == false
+      out, err = exec_skim *args, '--stdin' do |i|
+        i.write content
+      end
+      yield out, err
+    end
+
+    # case 2. file → $stdout
+    unless options[:file_stdout] == false
+      with_tempfile content do |in_file|
+        out, err = exec_skim *args, in_file
+        yield out, err
+      end
+    end
+
+    # case 3. $stdin → file
+    unless options[:stdin_file] == false
+      with_tempfile content do |out_file|
+        _, err = exec_skim *args, '--stdin', out_file do |i|
+          i.write content
+        end
+        yield File.read(out_file), err
+      end
+    end
+
+    # case 4. file → file
+    unless options[:file_file] == false
+      with_tempfile '' do |out_file|
+        with_tempfile content do |in_file|
+          _, err = exec_skim *args, in_file, out_file do |i|
+            i.write content
+          end
+          yield File.read(out_file), err
+        end
+      end
+    end
+  end
+
+  def evaluate(src, expression)
+    ExecJS.compile(src).eval(expression)
+  end
+
+  def evaluate_node(src, expression)
+    evaluate("var module = {};\nvar global = this;\n" + src, expression)
+  end
+
+  # Calls bin/skim as a subprocess.
+  #
+  # Yields $stdin to the caller and returns a tupel (out, err) with the
+  # contents of $stdout and $stderr.
+  def exec_skim(*args)
+    out, err = nil, nil
+
+    Open3.popen3 'ruby', 'bin/skim', *args do |stdin, stdout, stderr, wait_thread|
+      yield stdin if block_given?
+      stdin.close
+      out, err = stdout.read, stderr.read
+    end
+
+    return out, err
+  end
+
+  # Creates a temporary file with the given content and yield the path
+  # to this file. The file itself is only available inside the block and
+  # will be deleted afterwards.
+  def with_tempfile(content=nil, extname='skim')
+    f = Tempfile.new ['skim', ".#{extname}"]
+    if content
+      f.write content
+      f.flush # ensure content is actually saved to disk
+      f.rewind
+    end
+
+    yield f.path
+  ensure
+    f.close
+    f.unlink
+  end
+
+end

data/test/test_html_escaping.rb

@@ -38,8 +38,7 @@ p class="#{x}" test #{content}
 
   def test_html_nested_escaping
     source = %q{
-= @callback "Test", ->
-  | escaped &
+= @callback "Test", -> 'escaped &'
 }
     with_and_without_asset do
       assert_html 'Test escaped & Test', source

data/test/test_html_structure.rb

@@ -358,7 +358,7 @@ p<id="marvin"
 class="martian"
  data-info="Illudium Q-36"> = @output_number()
 }
-    Slim::Parser::DELIMS.each do |k,v|
+    Slim::Parser.options[:attr_list_delims].each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">1337</p>', str
     end
@@ -370,7 +370,7 @@ p<id="marvin"
   class="martian"
  data-info="Illudium Q-36"> THE space modulator
 }
-    Slim::Parser::DELIMS.each do |k,v|
+    Slim::Parser.options[:attr_list_delims].each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">THE space modulator</p>', str
     end
@@ -383,7 +383,7 @@ p<id="marvin"
 data-info="Illudium Q-36">
   | THE space modulator
 }
-    Slim::Parser::DELIMS.each do |k,v|
+    Slim::Parser.options[:attr_list_delims].each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">THE space modulator</p>', str
     end
@@ -396,7 +396,7 @@ p<id=@id_helper()
   data-info="Illudium Q-36">
   | THE space modulator
 }
-    Slim::Parser::DELIMS.each do |k,v|
+    Slim::Parser.options[:attr_list_delims].each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<p class="martian" data-info="Illudium Q-36" id="notice">THE space modulator</p>', str
     end
@@ -410,7 +410,7 @@ p<id=@id_helper()
   span.emphasis THE
   |  space modulator
 }
-    Slim::Parser::DELIMS.each do |k,v|
+    Slim::Parser.options[:attr_list_delims].each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<p class="martian" data-info="Illudium Q-36" id="notice"><span class="emphasis">THE</span> space modulator</p>', str
     end
@@ -423,7 +423,7 @@ li< id="myid"
 data-info="myinfo">
   a href="link" My Link
 }
-    Slim::Parser::DELIMS.each do |k,v|
+    Slim::Parser.options[:attr_list_delims].each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<li class="myclass" data-info="myinfo" id="myid"><a href="link">My Link</a></li>', str
     end

data/test/test_skim_template.rb

@@ -11,11 +11,11 @@ class TestSkimTemplate < TestSkim
   end
 
   def test_sprockets_integration_with_asset
-    Skim::Engine.default_options[:use_asset] = true
+    Skim::Engine.options[:use_asset] = true
     compiled = ExecJS.compile(skim_source + ";" + asset_source('test.js'))
     assert_equal "<p>Hello World, meet Skim</p>", compiled.eval("JST.test({name: 'Skim'})")
   ensure
-    Skim::Engine.default_options[:use_asset] = false
+    Skim::Engine.options[:use_asset] = false
   end
 
   def test_sprockets_require_directive

data/vendor/assets/javascripts/skim.js.coffee

@@ -35,11 +35,13 @@ this.Skim =
 
     context.escape ||= @escape || (string) ->
       return '' unless string?
-      return string if string.skimSafe
-      @safe (''+string)
+      if string.skimSafe or not /[&<>\"]/.test(string)
+        return string
+
+      @safe(('' + string)
         .replace(/&/g, '&amp;')
         .replace(/</g, '&lt;')
         .replace(/>/g, '&gt;')
-        .replace(/"/g, '&quot;')
+        .replace(/"/g, '&quot;'))
 
     block.call(context)

metadata

@@ -1,180 +1,172 @@
 --- !ruby/object:Gem::Specification
 name: skim
 version: !ruby/object:Gem::Version
-  version: 0.9.0
-  prerelease: 
+  version: 0.11.0
 platform: ruby
 authors:
-- John Firebaugh
+- AppJudo Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-script-source
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: execjs
+  name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: execjs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: therubyracer
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: libv8
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.8.3
+        version: '8.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.8.3
+        version: '8.4'
 description: Fat-free client-side templates with Slim and CoffeeScript
 email:
-- john.firebaugh@gmail.com
-executables: []
+- info@appjudo.com
+executables:
+- skim
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - History.md
 - LICENSE
 - README.md
 - Rakefile
+- bin/skim
 - lib/skim.rb
 - lib/skim/code_attributes.rb
+- lib/skim/command.rb
 - lib/skim/controls.rb
 - lib/skim/engine.rb
 - lib/skim/interpolation.rb
 - lib/skim/rails.rb
+- lib/skim/sprockets.rb
 - lib/skim/template.rb
 - lib/skim/version.rb
 - lib/temple/coffee_script.rb
@@ -196,34 +188,34 @@ files:
 - test/test_code_evaluation.rb
 - test/test_code_output.rb
 - test/test_code_structure.rb
+- test/test_commands.rb
 - test/test_html_escaping.rb
 - test/test_html_structure.rb
 - test/test_skim_template.rb
 - test/test_text_interpolation.rb
 - vendor/assets/javascripts/skim.js.coffee
 homepage: ''
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 3.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Take the fat out of your client-side templates with Skim. Skim is the Slim
   templating engine with embedded CoffeeScript. It compiles to JavaScript templates
   (.jst), which can then be served by Rails or any other Sprockets-based asset pipeline.
@@ -238,6 +230,7 @@ test_files:
 - test/test_code_evaluation.rb
 - test/test_code_output.rb
 - test/test_code_structure.rb
+- test/test_commands.rb
 - test/test_html_escaping.rb
 - test/test_html_structure.rb
 - test/test_skim_template.rb