sliq 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0942e2847a129b8a01772464797196125a53074
-  data.tar.gz: e7f88da72630a4f46496cb24c73b18d3909a1021
+  metadata.gz: faa546c3a75c8771be2888d06837271c1e78351f
+  data.tar.gz: f316ed4112d3b2c2228e4d6d5e0893d5f444cb78
 SHA512:
-  metadata.gz: fcaf3424ed42786dc30a7b56c56d18143bb64a7c3af09eec7e460aa050c96a05b2dfdb7f4cf2ef8adb7b1bcd19aa7ef436f8c2f263104c6c0b1988c35e750600
-  data.tar.gz: 7897a0eb77d63f2ef10c39b23323515eadf562a0d2b5e53de30b4902fc95a13e5bf612501d248a17bfd6d51fea64eee6474aaf78f7813a241d93b4d20bba0964
+  metadata.gz: 56eb8d1714545422e2aaa60f2037aedd01ccae3645fe574f002ddfb40674422d4a5a851383ed20e5b1116211947b75f363b7a2fc61951de71114c9d4a1221cfc
+  data.tar.gz: 4fef2069c0f4791a276c676bd8ee98857bdbb8947a70a35d94eaad36954f3ddad254b8e4d348ca982b32ec69bcddfb8559dcd3f13b0b418f265c5244ff087229

data/lib/sliq.rb

@@ -4,7 +4,7 @@ require 'tilt/liquid'
 
 module Sliq
   class Parser < Slim::Parser
-    set_default_options :attr_list_delims => {
+    define_options attr_list_delims: {
       '(' => ')',
       '[' => ']'
     }
@@ -56,11 +56,19 @@ module Sliq
       block = [:multi]
       begin
         case string
-        when /\A\{/
-          string, code = parse_expression($')
-          block << [:escape, false, [:slim, :interpolate, "{#{code}}"]]
-        when /\A([^\{]*)/
-          block << [:slim, :interpolate, $&]
+        when /\A\\{\{/
+          # Escaped interpolation
+          block << [:static, '{{']
+          string = $'
+        when /\A\{{2}((?>[^{}]|(\{{2}(?>[^{}]|\g<1>)*\}{2}))*)\}{2}/
+          # Interpolation
+          string, code = $', $1
+          escape = code !~ /\A\{.*\}\Z/
+          block << [:slim, :output, escape, escape ? code : code[1..-2], [:multi]]
+        # TODO: make reg exp for liquid static text
+        when /\A([#\\]?[^#\\]*([#\\][^\\#\{][^#\\]*)*)/
+          # Static text
+          block << [:static, $&]
           string = $'
         end
       end until string.empty?
@@ -69,7 +77,7 @@ module Sliq
   end
 
   class Engine < Slim::Engine
-    replace Slim::Parser, Parser, :file, :tabsize, :shortcut, :default_tag, :attr_delims, :attr_list_delims, :code_attr_delims
+    replace Slim::Parser, Parser, Parser.options
     before Slim::Interpolation, Interpolation
     after Parser, Tags
   end

data/lib/sliq/version.rb

@@ -1,3 +1,3 @@
 module Sliq
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/sliq.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
   s.executables       = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths     = %w(lib)
 
-  s.add_runtime_dependency('slim', ['~> 2.1.0'])
-  s.add_runtime_dependency('liquid', ['~> 2.5.5'])
+  s.add_runtime_dependency('slim', ['~> 3.0'])
+  s.add_runtime_dependency('liquid', ['~> 3.0'])
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sliq
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Daniel Mendler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2016-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.5
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.5
+        version: '3.0'
 description: Process template with Slim and Liquid afterwards.
 email:
 - mail@daniel-mendler.de
@@ -71,9 +71,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sliq
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Slim and Liquid working together.
 test_files: []
-has_rdoc: