skim 0.8.2 → 0.8.3

data/History.md

@@ -1,5 +1,9 @@
 # master
 
+# 0.8.3
+
+* Fix sprockets integration (#17)
+
 # 0.8.2
 
 * Fixed "Unexpected token return" ([issue #10](https://github.com/jfirebaugh/skim/issues/10))

data/lib/skim/template.rb

@@ -8,8 +8,8 @@ module Skim
         :file => eval_file,
         :indent => 2 }, options)
       <<SRC
+#{self.class.skim_src unless engine.options[:use_asset]}
 return (context = {}) ->
-  #{self.class.skim_src unless engine.options[:use_asset]}
   Skim.withContext.call {}, context, ->
 #{engine.call(data)}
 SRC

data/lib/skim/version.rb

@@ -1,3 +1,3 @@
 module Skim
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

data/skim.gemspec

@@ -26,6 +26,6 @@ Sprockets-based asset pipeline.}
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "execjs"
-  gem.add_development_dependency "minitest-reporters"
+  gem.add_development_dependency "minitest-reporters", "~> 0.10"
   gem.add_development_dependency "therubyracer"
 end

data/test/helper.rb

@@ -3,14 +3,13 @@ require "minitest/unit"
 require "minitest/reporters"
 require "skim"
 require "coffee_script"
+require "execjs"
 
-MiniTest::Unit.runner = MiniTest::SuiteRunner.new
-MiniTest::Unit.runner.reporters <<
-  if ENV["RM_INFO"] || ENV["TEAMCITY_VERSION"]
-    MiniTest::Reporters::RubyMineReporter.new
-  else
-    MiniTest::Reporters::ProgressReporter.new
-  end
+if ENV["RM_INFO"] || ENV["TEAMCITY_VERSION"]
+  MiniTest::Reporters.use! MiniTest::Reporters::RubyMineReporter.new
+else
+  MiniTest::Reporters.use! MiniTest::Reporters::ProgressReporter.new
+end
 
 MiniTest::Unit.autorun
 
@@ -19,6 +18,10 @@ class TestSkim < MiniTest::Unit::TestCase
     File.read(File.expand_path("../context.coffee", __FILE__))
   end
 
+  def skim_source
+    CoffeeScript.compile(Skim::Template.skim_src)
+  end
+
   def setup
     @context = CoffeeScript.compile(context_source, :bare => true)
   end
@@ -39,7 +42,6 @@ class TestSkim < MiniTest::Unit::TestCase
   end
 
   def evaluate(source, options = {})
-    require "execjs"
     code = [
       @context,
       "var context  = #{context(options)}",
@@ -47,7 +49,7 @@ class TestSkim < MiniTest::Unit::TestCase
       "var evaluate = function () { return template(context); }"
     ]
     if Skim::Engine.default_options[:use_asset]
-      code.unshift CoffeeScript.compile(Skim::Template.skim_src)
+      code.unshift skim_source
     end
     context = ExecJS.compile(code.join(";"))
     context.call("evaluate")

data/test/test.jst.skim

@@ -0,0 +1 @@
+p Hello World, meet #{@name}

data/test/test_skim_template.rb

@@ -1,7 +1,27 @@
 require 'helper'
 
-class TestSlimTemplate < TestSkim
+class TestSkimTemplate < TestSkim
   def test_registered_extension
     assert_equal Skim::Template, Tilt['test.skim']
   end
+
+  def test_sprockets_integration_without_asset
+    compiled = ExecJS.compile(template_source)
+    assert_equal "<p>Hello World, meet Skim</p>", compiled.eval("JST.test({name: 'Skim'})")
+  end
+
+  def test_sprockets_integration_with_asset
+    Skim::Engine.default_options[:use_asset] = true
+    compiled = ExecJS.compile(skim_source + ";" + template_source)
+    assert_equal "<p>Hello World, meet Skim</p>", compiled.eval("JST.test({name: 'Skim'})")
+  ensure
+    Skim::Engine.default_options[:use_asset] = false
+  end
+
+  private
+  def template_source
+    env = Sprockets::Environment.new
+    env.append_path File.dirname(__FILE__)
+    env['test.js'].to_s
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skim
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 00:00:00.000000000 Z
+date: 2012-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &70320036663300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70320036663300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: temple
-  requirement: &70320036662800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70320036662800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70320036662420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70320036662420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-script-source
-  requirement: &70320036661880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70320036661880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70320036661460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70320036661460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70320036661000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70320036661000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70320036660580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70320036660580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70320036660160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,21 +133,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70320036660160
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: &70320036659740 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.10'
   type: :development
   prerelease: false
-  version_requirements: *70320036659740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &70320036659320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +165,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70320036659320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Fat-free client-side templates with Slim and CoffeeScript
 email:
 - john.firebaugh@gmail.com
@@ -153,6 +203,7 @@ files:
 - skim.gemspec
 - test/context.coffee
 - test/helper.rb
+- test/test.jst.skim
 - test/test_attribute_merger.rb
 - test/test_code_blocks.rb
 - test/test_code_escaping.rb
@@ -177,15 +228,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2008655535929330993
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2008655535929330993
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Take the fat out of your client-side templates with Skim. Skim is the Slim
@@ -194,6 +251,7 @@ summary: Take the fat out of your client-side templates with Skim. Skim is the S
 test_files:
 - test/context.coffee
 - test/helper.rb
+- test/test.jst.skim
 - test/test_attribute_merger.rb
 - test/test_code_blocks.rb
 - test/test_code_escaping.rb
@@ -205,4 +263,3 @@ test_files:
 - test/test_sections.rb
 - test/test_skim_template.rb
 - test/test_text_interpolation.rb
-has_rdoc: