faml 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00278629939c45cb0b99bb33b4804a1632fe9e2b
-  data.tar.gz: 8c70078e0c7da99320775bd7b1e9fbadae654aa3
+  metadata.gz: da0d5a40e368fd95bce13511a6c083c338a79698
+  data.tar.gz: 5835483174f686095295d5a93dcd00decd5c1e49
 SHA512:
-  metadata.gz: 0d4a3d25800c968bd0499386817e64293bd8bc99cfe2df3d8bc05d827c2fee83e663f9d7b793429a3f0ded1f8d2b662e656ed89dc76ae801c0084394506f3bb1
-  data.tar.gz: aacf989f3c254913503803e8596cb05c90fcc839f43344bcca6a3379132a06ccfac92a62db9738dd7886cbc54928d12c2e5703c5a298c3cbd0b244a7b08009fe
+  metadata.gz: dc1faad685fd051a3a2fcbd63f4dc6059b300d6e66a57aad98e77662f13da0bcc4205bd261f2d90bfa9bb5f9abf23ba504be2c988e168ef9f282a90ec7dd6c09
+  data.tar.gz: 1cf54d88358b06fdd8f9b2c78a2415820fc83a0f806ab16bd4a98b076b03fcc8bbf93e069d0f3cb5fc1337c8b5a682acbeca952c35b33df612200386a2ff0b68

data/.travis.yml

@@ -11,7 +11,7 @@ gemfile:
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_edge.gemfile
 after_script:
-  - bundle exec rake benchmark:rendering
+  - bundle exec rake benchmark
 matrix:
   allow_failures:
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.9 (2015-04-04)
+- Keep code newlines with multiline
+    - https://github.com/eagletmt/faml/issues/18
+- Disable haml multiline syntax within filter
+- Fix `__LINE__` and `__FILE__` in attribute lists
+
 ## 0.2.8 (2015-04-02)
 - Allow empty silent script body
     - For compatibility with haml

data/README.md

@@ -58,6 +58,10 @@ is always rendered as
 
 It's equivalent to haml's "ugly" mode.
 
+### No Haml::Helpers except for preserve
+I won't provide helper methods of Haml::Helpers except for `preserve` .
+If you really need other helper methods, please open an issue.
+
 ### Others
 If you find other incompatibility, please report it to me :-p.
 

data/Rakefile

@@ -10,24 +10,41 @@ end
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
+task :benchmark => ['benchmark:rendering', 'benchmark:compiling']
+
 namespace :benchmark do
   task :rendering => ['benchmark:rendering:haml', 'benchmark:rendering:attributes', 'benchmark:rendering:slim']
   namespace :rendering do
-    desc "Run benchmark with Haml's standard template"
+    desc "Run rendering benchmark with Haml's standard template"
     task :haml do
       haml_gem = Gem::Specification.find_by_name('haml')
       standard_haml_path = File.join(haml_gem.gem_dir, 'test', 'templates', 'standard.haml')
       sh 'ruby', 'benchmark/rendering.rb', standard_haml_path
     end
 
-    desc "Run benchmark for attribute builder"
+    desc "Run rendering benchmark for attribute builder"
     task :attributes do
       sh 'ruby', 'benchmark/rendering.rb', 'benchmark/attribute_builder.haml', 'benchmark/attribute_builder.slim'
     end
 
-    desc "Run slim's benchmark"
+    desc "Run slim's rendering benchmark"
     task :slim do
       sh 'ruby', 'benchmark/slim.rb'
     end
   end
+
+  task :compiling => ['benchmark:compiling:haml', 'benchmark:compiling:slim']
+  namespace :compiling do
+    desc "Run compiling benchmark with Haml's standard template"
+    task :haml do
+      haml_gem = Gem::Specification.find_by_name('haml')
+      standard_haml_path = File.join(haml_gem.gem_dir, 'test', 'templates', 'standard.haml')
+      sh 'ruby', 'benchmark/compiling.rb', standard_haml_path
+    end
+
+    desc "Run slim's compiling benchmark"
+    task :slim do
+      sh 'ruby', 'benchmark/compiling.rb', 'benchmark/view.haml', 'benchmark/view.slim'
+    end
+  end
 end

data/benchmark/compiling.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+require 'benchmark/ips'
+require 'haml'
+require 'faml'
+require 'slim'
+require 'escape_utils/html/haml'
+
+unless ARGV[0]
+  $stderr.puts "Usage: #{$0} template.haml [template.slim]"
+  exit 1
+end
+
+haml_code = File.read(ARGV[0])
+slim_code = ARGV[1] ? File.read(ARGV[1]) : nil
+
+Benchmark.ips do |x|
+  x.report('Haml') { Haml::Engine.new(haml_code, ugly: true, escape_html: true) }
+  x.report('Faml') { Faml::Engine.new.call(haml_code) }
+  if slim_code
+    x.report('Slim') { Slim::Engine.new.call(slim_code) }
+  end
+  x.compare!
+end

data/lib/faml/cli.rb

@@ -5,7 +5,8 @@ module Faml
   class CLI < Thor
     desc 'render FILE', 'Render haml template'
     def render(file)
-      puts eval(compile_file(file))
+      code = compile_file(file)
+      puts instance_eval(code, file)
     end
 
     desc 'compile FILE', 'Compile haml template'

data/lib/faml/compiler.rb

@@ -228,7 +228,8 @@ module Faml
       end
 
       if attrs = try_optimize_attributes(text, static_id, static_class)
-        return [:html, :attrs, *attrs]
+        line_count = text.count("\n")
+        return [:multi, [:html, :attrs, *attrs]].concat([[:newline]] * line_count)
       end
 
       # Slow version
@@ -278,6 +279,12 @@ module Faml
         return nil
       end
 
+      if text.include?("\n") && !dynamic_attributes.empty?
+        # XXX: Quit optimization to keep newlines
+        # https://github.com/eagletmt/faml/issues/18
+        return nil
+      end
+
       (static_attributes.keys + dynamic_attributes.keys).sort.flat_map do |k|
         if static_attributes.has_key?(k)
           compile_static_attribute(k, static_attributes[k])

data/lib/faml/element_parser.rb

@@ -99,7 +99,7 @@ module Faml
           return [attr[1, attr.size-2], s.rest]
         else
           if /,\s*\z/ === text && @line_parser.has_next?
-            text << @line_parser.next_line
+            text << "\n" << @line_parser.next_line
           else
             syntax_error!('Unmatched brace')
           end
@@ -122,7 +122,7 @@ module Faml
           return [new_attributes, s.rest]
         else
           if @line_parser.has_next?
-            text << ' ' << @line_parser.next_line
+            text << "\n" << @line_parser.next_line
           else
             syntax_error!('Unmatched paren')
           end

data/lib/faml/line_parser.rb

@@ -8,9 +8,9 @@ module Faml
       @lineno = 0
     end
 
-    def next_line
+    def next_line(in_filter: false)
       line = move_next
-      if is_multiline?(line)
+      if !in_filter && is_multiline?(line)
         next_multiline(line)
       else
         line
@@ -61,7 +61,7 @@ module Faml
           break
         end
       end
-      buf.join
+      buf.join("\n")
     end
   end
 end

data/lib/faml/parser.rb

@@ -23,15 +23,21 @@ module Faml
       @filter_parser = FilterParser.new(@indent_tracker)
 
       while @line_parser.has_next?
-        line = @line_parser.next_line
-        if !@ast.is_a?(Ast::HamlComment) && @filter_parser.enabled?
+        in_filter = !@ast.is_a?(Ast::HamlComment) && @filter_parser.enabled?
+        line = @line_parser.next_line(in_filter: in_filter)
+        if in_filter
           ast = @filter_parser.append(line)
           if ast
             @ast << ast
           end
         end
         unless @filter_parser.enabled?
+          line_count = line.count("\n")
+          line.delete!("\n")
           parse_line(line)
+          line_count.times do
+            @ast << create_node(Ast::Empty)
+          end
         end
       end
 
@@ -165,6 +171,12 @@ module Faml
       end
       @stack.push(@ast)
       @ast = @ast.children.last
+      case @ast
+      when Ast::Text
+        syntax_error!('nesting within plain text is illegal')
+      when Ast::Doctype
+        syntax_error!('nesting within a header command is illegal')
+      end
       @ast.children = empty_lines
       if @ast.is_a?(Ast::Element) && @ast.self_closing
         syntax_error!('Illegal nesting: nesting within a self-closing tag is illegal')

data/lib/faml/ruby_multiline.rb

@@ -6,7 +6,7 @@ module Faml
         current_text = line_parser.next_line
         buf << current_text
       end
-      buf.join(' ')
+      buf.join("\n")
     end
 
     # `text' is a Ruby multiline block if it:

data/lib/faml/static_hash_parser.rb

@@ -14,7 +14,9 @@ module Faml
     end
 
     def parse(text)
-      parser = ::Parser::CurrentRuby.new
+      builder = ::Parser::Builders::Default.new
+      builder.emit_file_line_as_literals = false
+      parser = ::Parser::CurrentRuby.new(builder)
       parser.diagnostics.consumer = nil
       buffer = ::Parser::Source::Buffer.new('(faml)')
       buffer.source = text

data/lib/faml/version.rb

@@ -1,3 +1,3 @@
 module Faml
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

data/spec/compiler_newline_spec.rb

@@ -155,6 +155,46 @@ HAML
   }
 
 %span= raise LineVerifier
+HAML
+      end
+    end
+
+    context 'with multiline' do
+      it 'keeps newlines in static attributes' do
+        expect { render_string(<<HAML) }.to raise_error(LineVerifier, raised_at(3))
+%span{a: 1,
+  b: 2}
+= raise LineVerifier
+HAML
+      end
+
+      it 'keeps newlines in dynamic attributes' do
+        expect { render_string(<<HAML) }.to raise_error(LineVerifier, raised_at(2))
+%span{a: 1,
+  b: raise(LineVerifier)}
+hello
+HAML
+        expect { render_string(<<HAML) }.to raise_error(LineVerifier, raised_at(3))
+%span{a: 1,
+  b: 2 + 3}
+= raise LineVerifier
+HAML
+      end
+
+      it 'keeps newlines in ruby attributes' do
+        expect { render_string(<<HAML) }.to raise_error(LineVerifier, raised_at(2))
+%span{[1,
+  raise(LineVerifier)]}
+hello
+HAML
+      end
+
+      it 'keeps newlines in haml multiline' do
+        expect(render_string(<<HAML)).to eq("foo bar 1\n4\n")
+= 'foo ' + |
+  'bar ' + |
+  __LINE__.to_s |
+= __LINE__
 HAML
       end
     end

data/spec/render/attribute_spec.rb

@@ -175,6 +175,13 @@ HAML
     end
   end
 
+  it 'renders __LINE__ correctly' do
+    expect(render_string(<<HAML)).to eq("<span a='2' b='1'></span>\n")
+%span{b: __LINE__,
+  a: __LINE__}
+HAML
+  end
+
   describe 'with HTML-style attributes' do
     it 'parses simple values' do
       expect(render_string('%span(foo=1 bar=3) hello')).to eq("<span bar='3' foo='1'>hello</span>\n")

data/spec/render/doctype_spec.rb

@@ -54,4 +54,11 @@ RSpec.describe 'Doctype rendering', type: :render do
       expect(render_string('!!! 5', format: :xhtml)).to eq(%Q|<!DOCTYPE html>\n|)
     end
   end
+
+  it 'raises error when doctype has children' do
+    expect { render_string(<<HAML) }.to raise_error(Faml::SyntaxError, /nesting within a header command/)
+!!!
+  hello
+HAML
+  end
 end

data/spec/render/multiline_spec.rb

@@ -41,6 +41,15 @@ HAML
     expect(render_string(<<HAML)).to eq("<div bar='2' foo='1'></div>\n")
 %div{foo: 1, |
   bar: 2}
+HAML
+  end
+
+  it "isn't enabled in filter" do
+    expect(render_string(<<HAML)).to eq("<script>\n  hello |\n  world |\n</script>\n4\n")
+:javascript
+  hello |
+  world |
+= __LINE__
 HAML
   end
 end

data/spec/render/plain_spec.rb

@@ -17,4 +17,11 @@ HAML
   it 'raises error when interpolation is unterminated' do
     expect { render_string('%span foo#{1 + 2') }.to raise_error(Faml::TextCompiler::InvalidInterpolation)
   end
+
+  it 'raises error when text has children' do
+    expect { render_string(<<HAML) }.to raise_error(Faml::SyntaxError, /nesting within plain text/)
+hello
+  world
+HAML
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faml
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -269,6 +269,7 @@ files:
 - Rakefile
 - benchmark/attribute_builder.haml
 - benchmark/attribute_builder.slim
+- benchmark/compiling.rb
 - benchmark/context.rb
 - benchmark/rendering.rb
 - benchmark/slim.rb
@@ -432,7 +433,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Faster implementation of Haml template language.