liquidscript 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f8c6c51fffb0d24bf827a356b8cf8c46e2bed25
-  data.tar.gz: e67a07ac9bbf1d249dde0b499d334b1084d6fd15
+  metadata.gz: 51ca166ca554e616ff1286df7160d3562d17bec9
+  data.tar.gz: 014dddad0abfc08a64e106287e9c22913baa407c
 SHA512:
-  metadata.gz: 629068c68ffea87eaa555918f770424272be615355651c0e19c81113f6416136d288a99f6ef2c24fb6485e75821a613913437d6c0997f0477787794cb63e2535
-  data.tar.gz: dba22b9effe63127631a2687961bdb8d4c8b46051430e152bd680eabe573d2c131a4f44bd78a41258a503abcab3445877948e519ea4ada251909f0098e3b6a4a
+  metadata.gz: 62a05f026218fb4b63e17bb462da4a52b03a51404daac97aeb3a717995d57c030c819ba77d9af731d58cd4067f32d82ece97cccefc489a4ea321686e5e4ba59e
+  data.tar.gz: dbc2e0f247123670a9472e0e507e6c3ea15f42b33f41678423ccdf138806c6793dd64d0617550bc8d1890996d248133fef51787a8e196fb3ea0a574a0c39742d

data/bin/lscript

@@ -13,7 +13,7 @@ outfile = ARGV.shift || infile.gsub(/\.liq\Z/, ".js")
 File.open(infile, "r") do |f|
 
   begin
-    out = Liquidscript::Template.new(f.read).render
+    out = Liquidscript.compile(f.read)
     File.open(outfile, "w") { |o| o.write out }
   rescue StandardError => e
     $stderr.puts "ERROR: #{e.class}: #{e.message}"

data/lib/liquidscript.rb

@@ -5,7 +5,10 @@ require "liquidscript/version"
 require "liquidscript/scanner"
 require "liquidscript/compiler"
 require "liquidscript/generator"
-require "liquidscript/template"
+
+if defined? ::Sprockets
+  require "liquidscript/template"
+end
 
 module Liquidscript
   def self.compile(data)

data/lib/liquidscript/template.rb

@@ -1,18 +1,25 @@
-require 'liquidscript/icr/sexp'
+require "liquidscript"
+require "sprockets"
+require "tilt"
 
 module Liquidscript
-  class Template
+  class Template < ::Tilt::Template
+    self.default_mime_type = 'application/javascript'
 
-    def initialize(data)
-      @data = data
+    def self.engine_initialized?
+      defined? ::Liquidscript
     end
 
-    def render
-      @_render ||= begin
-        compiler = Compiler::ICR.new(Scanner::Liquidscript.new(@data))
-        compiler.compile
-        Generator::Javascript.new(compiler.top).generate
-      end
+    def initialize_engine
+      require_template_library "liquidscript"
+    end
+
+    def prepare; end
+
+    def evaluate(scope, locals, &block)
+      @output ||= Liquidscript.compile(data)
     end
   end
+
+  Sprockets.register_engine '.liq', Liquidscript::Template
 end

data/lib/liquidscript/version.rb

@@ -1,5 +1,5 @@
 module Liquidscript
 
   # The current version of liquidscript.
-  VERSION = "0.6.4".freeze
+  VERSION = "0.6.5".freeze
 end

data/spec/support/matchers/run.rb

@@ -1,7 +1,7 @@
 RSpec::Matchers.define :run do
   command = Command::Runner.new("node", "")
   match do |data|
-    @output = Liquidscript::Template.new(data).render
+    @output = Liquidscript.compile(data)
     @message = command.run({}, :input => @output)
     @message.successful?
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquidscript
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Jeremy Rodi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -155,7 +155,6 @@ files:
 - lib/liquidscript/scanner/token.rb
 - lib/liquidscript/template.rb
 - lib/liquidscript/version.rb
-- lib/sprockets/liquidscript_template.rb
 - liquidscript.gemspec
 - spec/fixtures/class.compile.yml
 - spec/fixtures/class.generate.yml

data/lib/sprockets/liquidscript_template.rb

@@ -1,16 +0,0 @@
-require "liquidscript"
-require "sprockets"
-
-module Sprockets
-  class LiquidscriptTemplate < Template
-    def self.default_mime_type
-      'application/javascript'
-    end
-
-    def render(context)
-      @output ||= Liquidscript.compile(data)
-    end
-  end
-
-  register_engine '.liq', LiquidscriptTemplate
-end