fast_haml 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8aa3367427fc4d33e2ff57ba8f1988f31be1047
-  data.tar.gz: da9216a9d2cc12bfdc92b90a9df75f1912876459
+  metadata.gz: a2c83a5231d99ca247d8eb0a5ed441c0a5a3282d
+  data.tar.gz: e1f75102f999b5183b3158c4db6650c8f1756031
 SHA512:
-  metadata.gz: 53802e8411247cecffb2987fde99ec569dfea66b73a1240ee9a33361f4c2e4ba7a2b13892f1952be33e8b84b75b56de75f93be0c93c40e2029eeeb2df7211a28
-  data.tar.gz: 8ec843e6e5946ae0fefcd3d04c3d7c62649a042a038641c716fc498ae60bdc163645f99503424e4a0191ae4ced649f8c276327671d1f579b478bdc298d319eb1
+  metadata.gz: 70b442e2627fa2c24dd0aed0a07d20c558bc01522196847cf25ffb6d6a2ffde032b6c200ced597634efa535406611841bc3935784e291548c4f5801516a334d5
+  data.tar.gz: 4245abb4f80c88a8a48121de6b4d83e8eb3c009f24d9ab63526e9738194b5e6f5e406d098208063cb543e4ea01f06cafda4e943ab72f95e5f4dcb6d9f5167d8f

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.10 (2015-03-19)
+- Fix ruby filter to not generate newlines
+- Support markdown filter
+
 ## 0.1.9 (2015-03-18)
 - Refactor script parser (internal)
 - Fix newline generation with filters

data/fast_haml.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "haml"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rake-compiler"
+  spec.add_development_dependency "redcarpet"
   spec.add_development_dependency "rspec", ">= 3"
   spec.add_development_dependency "sass"
   spec.add_development_dependency "simplecov"

data/lib/fast_haml/compiler.rb

@@ -100,6 +100,8 @@ module FastHaml
         false
       when Ast::Element
         !child.nuke_outer_whitespace
+      when Ast::Filter
+        FilterCompilers.find(child.name).need_newline?
       else
         true
       end

data/lib/fast_haml/filter_compilers.rb

@@ -33,6 +33,7 @@ require 'fast_haml/filter_compilers/coffee'
 require 'fast_haml/filter_compilers/css'
 require 'fast_haml/filter_compilers/escaped'
 require 'fast_haml/filter_compilers/javascript'
+require 'fast_haml/filter_compilers/markdown'
 require 'fast_haml/filter_compilers/plain'
 require 'fast_haml/filter_compilers/preserve'
 require 'fast_haml/filter_compilers/ruby'

data/lib/fast_haml/filter_compilers/base.rb

@@ -3,15 +3,25 @@ require 'fast_haml/text_compiler'
 module FastHaml
   module FilterCompilers
     class Base
+      def need_newline?
+        true
+      end
+
       protected
 
-      def compile_texts(temple, texts, tab_width: 0)
+      def compile_texts(temple, texts, tab_width: 0, keep_last_empty_lines: false)
         tabs = ' ' * tab_width
-        texts = strip_last_empty_lines(texts)
+        n = 0
+        unless keep_last_empty_lines
+          texts, n = strip_last_empty_lines(texts)
+        end
         texts.each do |text|
-          temple << [:static, tabs] << text_compiler.compile(text) << [:static, "\n"] << [:newline]
+          temple << [:static, tabs] << text_compiler.compile(text)
+          unless texts.last.equal?(text)
+            temple << [:static, "\n"] << [:newline]
+          end
         end
-        temple.pop  # discard last [:newline]
+        temple.concat([[:newline]] * n)
         nil
       end
 
@@ -20,11 +30,13 @@ module FastHaml
       end
 
       def strip_last_empty_lines(texts)
+        n = 0
         texts = texts.dup
         while texts.last && texts.last.empty?
+          n += 1
           texts.pop
         end
-        texts
+        [texts, n]
       end
     end
   end

data/lib/fast_haml/filter_compilers/cdata.rb

@@ -6,7 +6,7 @@ module FastHaml
       def compile(texts)
         temple = [:multi, [:static, "<![CDATA[\n"], [:newline]]
         compile_texts(temple, texts, tab_width: 4)
-        temple << [:static, "]]>"]
+        temple << [:static, "\n]]>"]
       end
     end
 

data/lib/fast_haml/filter_compilers/coffee.rb

@@ -4,7 +4,9 @@ module FastHaml
   module FilterCompilers
     class Coffee < TiltBase
       def compile(texts)
-        temple = compile_with_tilt('coffee', texts)
+        temple = [:multi, [:static, "\n"], [:newline]]
+        compile_with_tilt(temple, 'coffee', texts)
+        temple << [:static, "\n"]
         [:haml, :tag, 'script', false, [:html, :attrs], [:html, :js, temple]]
       end
     end

data/lib/fast_haml/filter_compilers/css.rb

@@ -6,6 +6,7 @@ module FastHaml
       def compile(texts)
         temple = [:multi, [:static, "\n"], [:newline]]
         compile_texts(temple, texts, tab_width: 2)
+        temple << [:static, "\n"]
         [:haml, :tag, 'style', false, [:html, :attrs], temple]
       end
     end

data/lib/fast_haml/filter_compilers/escaped.rb

@@ -8,6 +8,7 @@ module FastHaml
       def compile(texts)
         temple = [:multi, [:newline]]
         compile_texts(temple, texts)
+        temple << [:static, "\n"]
         escape_code = Temple::Filters::Escapable.new.instance_variable_get(:@escape_code)
         sym = unique_name
         [:multi,

data/lib/fast_haml/filter_compilers/javascript.rb

@@ -6,6 +6,7 @@ module FastHaml
       def compile(texts)
         temple = [:multi, [:static, "\n"], [:newline]]
         compile_texts(temple, texts, tab_width: 2)
+        temple << [:static, "\n"]
         [:haml, :tag, 'script', false, [:html, :attrs], [:html, :js, temple]]
       end
     end

data/lib/fast_haml/filter_compilers/markdown.rb

@@ -0,0 +1,18 @@
+require 'fast_haml/filter_compilers/tilt_base'
+
+module FastHaml
+  module FilterCompilers
+    class Markdown < TiltBase
+      def need_newline?
+        false
+      end
+
+      def compile(texts)
+        temple = [:multi, [:newline]]
+        compile_with_tilt(temple, 'markdown', texts)
+      end
+    end
+
+    register(:markdown, Markdown)
+  end
+end

data/lib/fast_haml/filter_compilers/plain.rb

@@ -5,13 +5,7 @@ module FastHaml
     class Plain < Base
       def compile(texts)
         temple = [:multi, [:newline]]
-        texts = strip_last_empty_lines(texts)
-        texts.each do |text|
-          temple << text_compiler.compile(text)
-          unless texts.last.equal?(text)
-            temple << [:static, "\n"] << [:newline]
-          end
-        end
+        compile_texts(temple, texts)
         temple
       end
     end

data/lib/fast_haml/filter_compilers/preserve.rb

@@ -7,12 +7,8 @@ module FastHaml
 
       def compile(texts)
         temple = [:multi, [:newline]]
-        texts.each do |text|
-          temple << text_compiler.compile(text)
-          unless texts.last.equal?(text)
-            temple << [:static, "\n"] << [:newline]
-          end
-        end
+        # I don't know why only :preserve filter keeps the last empty lines.
+        compile_texts(temple, texts, keep_last_empty_lines: true)
         sym = unique_name
         [:multi,
           [:capture, sym, temple],

data/lib/fast_haml/filter_compilers/ruby.rb

@@ -3,6 +3,10 @@ require 'fast_haml/filter_compilers/base'
 module FastHaml
   module FilterCompilers
     class Ruby < Base
+      def need_newline?
+        false
+      end
+
       def compile(texts)
         [:multi, [:newline], [:code, strip_last_empty_lines(texts).join("\n")]]
       end

data/lib/fast_haml/filter_compilers/sass.rb

@@ -4,7 +4,8 @@ module FastHaml
   module FilterCompilers
     class Sass < TiltBase
       def compile(texts)
-        temple = compile_with_tilt('sass', texts)
+        temple = [:multi, [:static, "\n"], [:newline]]
+        compile_with_tilt(temple, 'sass', texts)
         [:haml, :tag, 'style', false, [:html, :attrs], temple]
       end
     end

data/lib/fast_haml/filter_compilers/scss.rb

@@ -4,7 +4,9 @@ module FastHaml
   module FilterCompilers
     class Scss < TiltBase
       def compile(texts)
-        temple = compile_with_tilt('scss', texts)
+        temple = [:multi, [:static, "\n"], [:newline]]
+        compile_with_tilt(temple, 'scss', texts)
+        temple << [:static, "\n"]
         [:haml, :tag, 'style', false, [:html, :attrs], temple]
       end
     end

data/lib/fast_haml/filter_compilers/tilt_base.rb

@@ -14,16 +14,14 @@ module FastHaml
 
       protected
 
-      def compile_with_tilt(name, texts)
+      def compile_with_tilt(temple, name, texts)
         source = texts.join("\n")
-        temple = [:multi, [:static, "\n"], [:newline]]
         if TextCompiler.contains_interpolation?(source)
           text_temple = [:multi]
           compile_texts(text_temple, texts)
           sym = unique_name
           temple << [:capture, sym, text_temple]
           temple << [:dynamic, "::FastHaml::FilterCompilers::TiltBase.render_with_tilt(#{name.inspect}, #{sym})"]
-          temple << [:newline]
         else
           compiled = self.class.render_with_tilt(name, source)
           temple << [:static, compiled]

data/lib/fast_haml/version.rb

@@ -1,3 +1,3 @@
 module FastHaml
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

data/spec/compiler_newline_spec.rb

@@ -95,6 +95,30 @@ HAML
     end
   end
 
+  context 'with filters' do
+    it do
+      expect { render_string(<<HAML) }.to raise_error(LineVerifier, raised_at(5))
+:plain
+  hello
+
+
+= raise LineVerifier
+HAML
+    end
+
+    context 'with interpolation' do
+      it do
+        expect { render_string(<<'HAML') }.to raise_error(LineVerifier, raised_at(5))
+:plain
+  #{'hello'}
+
+
+= raise LineVerifier
+HAML
+      end
+    end
+  end
+
   context 'with tilt filters' do
     it 'keeps newlines in filter' do
       expect { render_string(<<'HAML') }.to raise_error(LineVerifier, raised_at(4))

data/spec/render/filters/markdown_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+RSpec.describe 'Markdown filter rendering', type: :render do
+  it 'renders Markdown filter' do
+    expect(render_string(<<HAML)).to eq("<h1>hello</h1>\nworld\n")
+:markdown
+  # hello
+world
+HAML
+  end
+
+  it 'parses string interpolation' do
+    expect(render_string(<<'HAML')).to eq("<h1>hello</h1>\nworld\n")
+:markdown
+  # #{'hello'}
+world
+HAML
+  end
+end

data/spec/render/filters/ruby_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 RSpec.describe 'Ruby filter rendering', type: :render do
   it 'renders ruby filter' do
-    expect(render_string(<<HAML)).to eq("\n3\n")
+    expect(render_string(<<HAML)).to eq("3\n")
 :ruby
   hash = {
     a: 3,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fast_haml
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Kohei Suzuki
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -263,6 +277,7 @@ files:
 - lib/fast_haml/filter_compilers/css.rb
 - lib/fast_haml/filter_compilers/escaped.rb
 - lib/fast_haml/filter_compilers/javascript.rb
+- lib/fast_haml/filter_compilers/markdown.rb
 - lib/fast_haml/filter_compilers/plain.rb
 - lib/fast_haml/filter_compilers/preserve.rb
 - lib/fast_haml/filter_compilers/ruby.rb
@@ -348,6 +363,7 @@ files:
 - spec/render/filters/css_spec.rb
 - spec/render/filters/escaped_spec.rb
 - spec/render/filters/javascript_spec.rb
+- spec/render/filters/markdown_spec.rb
 - spec/render/filters/plain_spec.rb
 - spec/render/filters/preserve_spec.rb
 - spec/render/filters/ruby_spec.rb
@@ -453,6 +469,7 @@ test_files:
 - spec/render/filters/css_spec.rb
 - spec/render/filters/escaped_spec.rb
 - spec/render/filters/javascript_spec.rb
+- spec/render/filters/markdown_spec.rb
 - spec/render/filters/plain_spec.rb
 - spec/render/filters/preserve_spec.rb
 - spec/render/filters/ruby_spec.rb