zorglub 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e7dee8a5205c1f0f2b8be300b2bb68251dbef0f762020332bcf47850bba7323
-  data.tar.gz: 169f7bd5d713d86544d83307fba364876ea6c2326bc2d31c551843854ec340f5
+  metadata.gz: 68a4bd30558640ea906ace0e87f4710be024e9f75dc2013bccba2954a146c994
+  data.tar.gz: c48af64abd895f0cb2c3514442c151ec92e7b59b1312fe4cfa9440e7a81bb610
 SHA512:
-  metadata.gz: '09cd0d8cbcdacf01223de522e97d64d3bbb50606f3f50006edcd50150724e0c4cf55d1bc7e65e3fd02ba93d56c4d002470453f64ba39d256081e8936ec59b8b9'
-  data.tar.gz: cfe3dbb427f4a3a488d5c6a0f111bd9723b244fe18925944eced6fa0c9774206e5987f4d19c0ad24db41ee304760aec0e7bf3825642da98c7aa0e38f6e23d76f
+  metadata.gz: 73a4fbea322ebe7bbccdf7433ceb726fe3e0afd69edf8db947342c0f9905d82c523b96eee283949dfbb7850bc6f76b1973e85f59e149b5c8058aff36411dfcdc
+  data.tar.gz: e52eb20c1e9a71c7a4b993c8285f0a3652d7358c0fbe9e541727df6139f9d3279a7338156c6710fc13e17b6686c9ab40026ec768f34fc673c9043b7177ba881a

data/lib/zorglub/app.rb

@@ -18,7 +18,8 @@ module Zorglub
         engines: {},
         haml_options: {
           format: :html5,
-          encoding: 'utf-8'
+          encoding: 'utf-8',
+          escape_html: false
         },
         sass_options: {
           syntax: :scss,

data/lib/zorglub/engines/haml.rb

@@ -5,12 +5,13 @@ module Zorglub
   module Engines
     module Haml
       def self.proc(path, obj)
-        haml = ::Haml::Template.new(path)
         if obj.app.opt(:engines_cache_enabled)
           key = path.sub obj.app.opt(:root), ''
-          obj.app.engines_cache[key] ||= haml
+          haml = obj.app.engines_cache[key] || ::Haml::Template.new(obj.app.opt(:haml_options)) { ::File.read(path) }
+        else
+          haml = ::Haml::Template.new(obj.app.opt(:haml_options)) { ::File.read(path) }
         end
-        html = haml.render(obj, obj.app.opt(:haml_options))
+        html = haml.render(obj)
         [html, 'text/html']
       end
     end

data/lib/zorglub/engines/sass.rb

@@ -4,10 +4,11 @@ module Zorglub
   module Engines
     module Sass
       def self.proc(path, obj)
-        sass = ::Sass::Engine.new(::File.read(path), obj.app.opt(:sass_options))
         if obj.app.opt(:engines_cache_enabled)
           key = path.sub obj.app.opt(:root), ''
-          obj.app.engines_cache[key] ||= sass
+          sass = obj.app.engines_cache[key] || ::Sass::Engine.new(::File.read(path), obj.app.opt(:sass_options))
+        else
+          sass = ::Sass::Engine.new(::File.read(path), obj.app.opt(:sass_options))
         end
         css = sass.render
         [css, 'text/css']

data/lib/zorglub.rb

@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 
 module Zorglub
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end
 
 require 'zorglub/node'

data/spec/data/view/node0/engines.haml

@@ -1 +1 @@
-%h1="Hello world"
+%h1="Hello #{@name}"

data/spec/node_spec.rb

@@ -266,10 +266,10 @@ describe Zorglub do
     it 'haml engine should work' do
       Node0.app.opt! :engines_cache_enabled, false
       r = Node0.my_call '/engines/haml'
-      expect(r.body[0]).to eq "<h1>Hello world</h1>\n"
+      expect(r.body[0]).to eq "<h1>Hello <i>world</i></h1>\n"
       Node0.app.opt! :engines_cache_enabled, true
       r = Node0.my_call '/engines/haml'
-      expect(r.body[0]).to eq "<h1>Hello world</h1>\n"
+      expect(r.body[0]).to eq "<h1>Hello <i>world</i></h1>\n"
     end
 
     it 'sass engine should work' do

data/spec/spec_helper.rb

@@ -112,6 +112,7 @@ class Node0 < Zorglub::Node
     no_layout!
     case name
     when 'haml'
+      @name = '<i>world</i>'
       engine! :haml
     when 'sass'
       engine! :sass

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zorglub
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jérémy Zurcher