hamlit 1.7.2 → 2.0.1

data/lib/hamlit/filters.rb

@@ -0,0 +1,65 @@
+require 'hamlit/filters/base'
+require 'hamlit/filters/text_base'
+require 'hamlit/filters/tilt_base'
+require 'hamlit/filters/coffee'
+require 'hamlit/filters/css'
+require 'hamlit/filters/erb'
+require 'hamlit/filters/escaped'
+require 'hamlit/filters/javascript'
+require 'hamlit/filters/less'
+require 'hamlit/filters/markdown'
+require 'hamlit/filters/plain'
+require 'hamlit/filters/preserve'
+require 'hamlit/filters/ruby'
+require 'hamlit/filters/sass'
+require 'hamlit/filters/scss'
+
+module Hamlit
+  class Filters
+    @registered = {}
+
+    class << self
+      attr_reader :registered
+
+      private
+
+      def register(name, compiler)
+        registered[name] = compiler
+      end
+    end
+
+    register :coffee,       Coffee
+    register :coffeescript, Coffee
+    register :css,          Css
+    register :erb,          Erb
+    register :escaped,      Escaped
+    register :javascript,   Javascript
+    register :less,         Less
+    register :markdown,     Markdown
+    register :plain,        Plain
+    register :preserve,     Preserve
+    register :ruby,         Ruby
+    register :sass,         Sass
+    register :scss,         Scss
+
+    def initialize(options = {})
+      @options = options
+      @compilers = {}
+    end
+
+    def compile(node)
+      node.value[:text] ||= ''
+      find_compiler(node).compile(node)
+    end
+
+    private
+
+    def find_compiler(node)
+      name = node.value[:name].to_sym
+      compiler = Filters.registered[name]
+      raise FilterNotFound.new("FilterCompiler for '#{name}' was not found", node.line.to_i - 1) unless compiler
+
+      @compilers[name] ||= compiler.new(@options)
+    end
+  end
+end

data/lib/hamlit/filters/base.rb

@@ -1,68 +1,10 @@
+require 'hamlit/parser/haml_util'
+
 module Hamlit
-  module Filters
+  class Filters
     class Base
-      attr_reader :options
-
-      def self.indent_source(source, indent_width: 0)
-        lines = source.split("\n")
-        self.new.compile_lines(lines, indent_width: indent_width)
-      end
-
       def initialize(options = {})
-        @options = options
-      end
-
-      def compile(lines)
-        raise NotImplementedError
-      end
-
-      def compile_lines(lines, indent_width: 0)
-        base  = (lines.first || '').index(/[^\s]/) || 0
-        width = indent_width - base
-        width = 0 if width < 0
-
-        lines = strip_last(lines).map do |line|
-          ' ' * width + line
-        end
-
-        text = lines.join("\n") + "\n"
-        text
-      end
-
-      private
-
-      # NOTE: empty line is reserved for preserve filter.
-      def strip_last(lines)
-        lines = lines.dup
-        while lines.last && lines.last.length == 0
-          lines.delete_at(-1)
-        end
-        lines
-      end
-
-      def compile_html(tag, lines)
-        ast = [:haml, :text, compile_lines(lines, indent_width: 2), false]
-        ast = [:multi, [:static, "\n"], ast]
-        ast = [:html, :tag, tag, [:html, :attrs], ast]
-        ast
-      end
-
-      def compile_xhtml(tag, type, lines)
-        attr  = [:html, :attr, 'type', [:static, type]]
-        attrs = [:html, :attrs, attr]
-
-        content = [:haml, :text, compile_lines(lines, indent_width: 4)]
-        multi = [:multi, [:static, "\n"], *cdata_for(type, content)]
-        [:html, :tag, tag, attrs, multi]
-      end
-
-      def cdata_for(type, ast)
-        case type
-        when 'text/javascript'
-          [[:static, "  //<![CDATA[\n"], ast, [:static, "  //]]>\n"]]
-        when 'text/css'
-          [[:static, "  /*<![CDATA[*/\n"], ast, [:static, "  /*]]>*/\n"]]
-        end
+        @format = options[:format]
       end
     end
   end

data/lib/hamlit/filters/coffee.rb

@@ -1,11 +1,13 @@
-require 'hamlit/filters/tilt'
-
 module Hamlit
-  module Filters
-    class Coffee < Filters::Tilt
-      def compile(lines)
-        ast = [:html, :tag, 'script', [:html, :attrs]]
-        compile_with_tilt('coffee', lines.join("\n"), ast)
+  class Filters
+    class Coffee < TiltBase
+      def compile(node)
+        require 'tilt/coffee' if explicit_require?
+        temple = [:multi]
+        temple << [:static, "<script>\n".freeze]
+        temple << compile_with_tilt(node, 'coffee', indent_width: 2)
+        temple << [:static, "</script>".freeze]
+        temple
       end
     end
   end

data/lib/hamlit/filters/css.rb

@@ -1,14 +1,31 @@
-require 'hamlit/filters/base'
-
 module Hamlit
-  module Filters
-    class Css < Base
-      def compile(lines)
-        if options[:format] == :xhtml
-          return compile_xhtml('style', 'text/css', lines)
+  class Filters
+    class Css < TextBase
+      def compile(node)
+        case @format
+        when :xhtml
+          compile_xhtml(node)
+        else
+          compile_html(node)
         end
+      end
+
+      private
+
+      def compile_html(node)
+        temple = [:multi]
+        temple << [:static, "<style>\n".freeze]
+        compile_text!(temple, node, '  '.freeze)
+        temple << [:static, "\n</style>".freeze]
+        temple
+      end
 
-        compile_html('style', lines)
+      def compile_xhtml(node)
+        temple = [:multi]
+        temple << [:static, "<style type='text/css'>\n  /*<![CDATA[*/\n".freeze]
+        compile_text!(temple, node, '    '.freeze)
+        temple << [:static, "\n  /*]]>*/\n</style>".freeze]
+        temple
       end
     end
   end

data/lib/hamlit/filters/erb.rb

@@ -1,10 +1,8 @@
-require 'hamlit/filters/tilt'
-
 module Hamlit
-  module Filters
-    class Erb < Filters::Tilt
-      def compile(lines)
-        compile_with_tilt('erb', lines.join("\n"), [], indent_width: 0)
+  class Filters
+    class Erb < TiltBase
+      def compile(node)
+        compile_with_tilt(node, 'erb')
       end
     end
   end

data/lib/hamlit/filters/escaped.rb

@@ -1,18 +1,20 @@
-require 'hamlit/filters/base'
-
 module Hamlit
-  module Filters
+  class Filters
     class Escaped < Base
-      def compile(lines)
-        ast = [:haml, :text, lines.join("\n")]
-        ast = [:multi, escape_html(ast)]
-        ast
+      def compile(node)
+        text = node.value[:text].rstrip
+        temple = compile_text(text)
+        [:escape, true, temple]
       end
 
       private
 
-      def escape_html(ast)
-        [:escape, true, ast]
+      def compile_text(text)
+        if ::Hamlit::HamlUtil.contains_interpolation?(text)
+          [:dynamic, ::Hamlit::HamlUtil.slow_unescape_interpolation(text)]
+        else
+          [:static, text]
+        end
       end
     end
   end

data/lib/hamlit/filters/javascript.rb

@@ -1,14 +1,31 @@
-require 'hamlit/filters/base'
-
 module Hamlit
-  module Filters
-    class Javascript < Base
-      def compile(lines)
-        if options[:format] == :xhtml
-          return compile_xhtml('script', 'text/javascript', lines)
+  class Filters
+    class Javascript < TextBase
+      def compile(node)
+        case @format
+        when :xhtml
+          compile_xhtml(node)
+        else
+          compile_html(node)
         end
+      end
+
+      private
+
+      def compile_html(node)
+        temple = [:multi]
+        temple << [:static, "<script>\n".freeze]
+        compile_text!(temple, node, '  '.freeze)
+        temple << [:static, "\n</script>".freeze]
+        temple
+      end
 
-        compile_html('script', lines)
+      def compile_xhtml(node)
+        temple = [:multi]
+        temple << [:static, "<script type='text/javascript'>\n  //<![CDATA[\n".freeze]
+        compile_text!(temple, node, '    '.freeze)
+        temple << [:static, "\n  //]]>\n</script>".freeze]
+        temple
       end
     end
   end

data/lib/hamlit/filters/less.rb

@@ -1,11 +1,13 @@
-require 'hamlit/filters/tilt'
-
 module Hamlit
-  module Filters
-    class Less < Filters::Tilt
-      def compile(lines)
-        ast = [:html, :tag, 'style', [:html, :attrs]]
-        compile_with_tilt('less', lines.join("\n"), ast)
+  class Filters
+    class Less < TiltBase
+      def compile(node)
+        require 'tilt/less' if explicit_require?
+        temple = [:multi]
+        temple << [:static, "<style>\n".freeze]
+        temple << compile_with_tilt(node, 'less', indent_width: 2)
+        temple << [:static, "</style>".freeze]
+        temple
       end
     end
   end

data/lib/hamlit/filters/markdown.rb

@@ -1,10 +1,9 @@
-require 'hamlit/filters/tilt'
-
 module Hamlit
-  module Filters
-    class Markdown < Filters::Tilt
-      def compile(lines)
-        compile_with_tilt('markdown', lines.join("\n"), [], indent_width: 0)
+  class Filters
+    class Markdown < TiltBase
+      def compile(node)
+        require 'tilt/redcarpet' if explicit_require?
+        compile_with_tilt(node, 'markdown')
       end
     end
   end

data/lib/hamlit/filters/plain.rb

@@ -1,20 +1,16 @@
-require 'hamlit/filters/base'
-
 module Hamlit
-  module Filters
+  class Filters
     class Plain < Base
-      def compile(lines)
-        ast = [:multi]
-        text = compile_lines(lines)
-        text.gsub!(/\n\Z/, '') unless string_interpolated?(text)
-        ast << [:haml, :text, text]
-        ast
-      end
-
-      private
-
-      def string_interpolated?(text)
-        text =~ /\#{[^\#{}]*}/
+      def compile(node)
+        text = node.value[:text].rstrip
+        if ::Hamlit::HamlUtil.contains_interpolation?(text)
+          # FIXME: Confirm whether this is correct or not
+          text << "\n".freeze
+          text = ::Hamlit::HamlUtil.slow_unescape_interpolation(text)
+          [:escape, true, [:dynamic, text]]
+        else
+          [:static, text]
+        end
       end
     end
   end

data/lib/hamlit/filters/preserve.rb

@@ -1,10 +1,20 @@
-require 'hamlit/filters/base'
-
 module Hamlit
-  module Filters
+  class Filters
     class Preserve < Base
-      def compile(lines)
-        [:multi, [:haml, :text, lines.join('&#x000A;')]]
+      def compile(node)
+        text = node.value[:text].rstrip + "\n"
+        text = text.gsub("\n", '&#x000A;')
+        compile_text(text)
+      end
+
+      private
+
+      def compile_text(text)
+        if ::Hamlit::HamlUtil.contains_interpolation?(text)
+          [:dynamic, ::Hamlit::HamlUtil.slow_unescape_interpolation(text)]
+        else
+          [:static, text]
+        end
       end
     end
   end

data/lib/hamlit/filters/ruby.rb

@@ -1,10 +1,8 @@
-require 'hamlit/filters/base'
-
 module Hamlit
-  module Filters
+  class Filters
     class Ruby < Base
-      def compile(lines)
-        [:multi, [:code, lines.join("\n")]]
+      def compile(node)
+        [:code, node.value[:text]]
       end
     end
   end

data/lib/hamlit/filters/sass.rb

@@ -1,11 +1,13 @@
-require 'hamlit/filters/tilt'
-
 module Hamlit
-  module Filters
-    class Sass < Filters::Tilt
-      def compile(lines)
-        ast = [:html, :tag, 'style', [:html, :attrs]]
-        compile_with_tilt('sass', lines.join("\n"), ast)
+  class Filters
+    class Sass < TiltBase
+      def compile(node)
+        require 'tilt/sass' if explicit_require?
+        temple = [:multi]
+        temple << [:static, "<style>\n".freeze]
+        temple << compile_with_tilt(node, 'sass', indent_width: 2)
+        temple << [:static, "</style>".freeze]
+        temple
       end
     end
   end

data/lib/hamlit/filters/scss.rb

@@ -1,11 +1,13 @@
-require 'hamlit/filters/tilt'
-
 module Hamlit
-  module Filters
-    class Scss < Filters::Tilt
-      def compile(lines)
-        ast = [:html, :tag, 'style', [:html, :attrs]]
-        compile_with_tilt('scss', lines.join("\n"), ast)
+  class Filters
+    class Scss < TiltBase
+      def compile(node)
+        require 'tilt/sass' if explicit_require?
+        temple = [:multi]
+        temple << [:static, "<style>\n".freeze]
+        temple << compile_with_tilt(node, 'scss', indent_width: 2)
+        temple << [:static, "</style>".freeze]
+        temple
       end
     end
   end