skim 0.9.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a11b26eb9caa17a860be644bd5d9036099b55b7
-  data.tar.gz: 07d318c21bc64991890c1aba045656936ebc3b5f
+  metadata.gz: a470567c16088d62d21e54cdc825aa825b41538f
+  data.tar.gz: 73231e1cf365ce5f9a930678a47aa340abda3afd
 SHA512:
-  metadata.gz: 6766b13ee4a1ccf20e367627a886386b9a542039c428eaa9ea9d9fc0b9a36eac3c017fefead45542517f0b212234d5bf6f7b301e0de6d4de205b5a29807d130e
-  data.tar.gz: 33b172e337b5a0140a5be04bbbdfc6fbf8693be3f0e353056aaecd9b6277a727f384653892078f8cb3a2c59eb828cea2912f3d46de00323730219d396e710429
+  metadata.gz: 1c654ea0925e2794a43fe1d0e73782e50cab4dd1f61b51fb4a16663a0e8c16519e95d9ee56632d1e9cc5dfa50ae38cb5a679b9ad3b5622efc5533c4a2d029d76
+  data.tar.gz: ada8580e4f214e9bdd14c436c582ea5434c1941d4764accde3f649271b3fd60150950a5bb2967dbc7d9b3b64f71724b4f56979c0dfbaf19068a25c483eb51c92

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.0.0

data/History.md

@@ -1,5 +1,9 @@
 # master
 
+# 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)

data/README.md

@@ -7,15 +7,8 @@ Sprockets-based asset pipeline.
 
 # Usage
 
-`gem install skim`, or add `skim` to your `Gemfile` in the `:assets` group:
-
-```ruby
-group :assets do
-  gem 'skim'
-end
-```
-
-Create template files with the extension `.jst.skim`. For example, `test.jst.skim`:
+`gem install skim`, or add `skim` to your `Gemfile`. Create template files with the extension
+`.jst.skim`. For example, `test.jst.skim`:
 
 ```jade
 p Hello #{@world}!

data/lib/skim/engine.rb

@@ -14,25 +14,26 @@ 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
-    use Temple::CoffeeScript::AttributeMerger, :merge_attrs
-    use Skim::CodeAttributes, :merge_attrs
+    use Slim::Splat::Filter
+    use Skim::Controls
+    html :AttributeSorter
+    html :AttributeMerger
+    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/version.rb

@@ -1,3 +1,3 @@
 module Skim
-  VERSION = "0.9.3"
+  VERSION = "0.10.0"
 end

data/skim.gemspec

@@ -17,14 +17,15 @@ Sprockets-based asset pipeline.}
   gem.require_paths = ["lib"]
   gem.version       = Skim::VERSION
 
-  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", "< 4"
 
   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 "minitest-reporters"
   gem.add_development_dependency "therubyracer"
-  gem.add_development_dependency "libv8", "3.11.8.17"
+  gem.add_development_dependency "libv8", "~> 3.16.14.0"
 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'
 }
@@ -87,9 +81,7 @@ 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

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_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

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

metadata

@@ -1,141 +1,161 @@
 --- !ruby/object:Gem::Specification
 name: skim
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
 platform: ruby
 authors:
 - John Firebaugh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   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'
 - !ruby/object:Gem::Dependency
   name: coffee-script-source
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: libv8
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.8.17
+        version: 3.16.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.8.17
+        version: 3.16.14.0
 description: Fat-free client-side templates with Slim and CoffeeScript
 email:
 - john.firebaugh@gmail.com
@@ -143,8 +163,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - History.md
 - LICENSE
@@ -192,17 +212,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Take the fat out of your client-side templates with Skim. Skim is the Slim