faml 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da0d5a40e368fd95bce13511a6c083c338a79698
-  data.tar.gz: 5835483174f686095295d5a93dcd00decd5c1e49
+  metadata.gz: 05912ba9442dfe72d17b8f1e9aacbf1484b036e7
+  data.tar.gz: d84fdc9481afa2e31fefb7b180a45664197706a2
 SHA512:
-  metadata.gz: dc1faad685fd051a3a2fcbd63f4dc6059b300d6e66a57aad98e77662f13da0bcc4205bd261f2d90bfa9bb5f9abf23ba504be2c988e168ef9f282a90ec7dd6c09
-  data.tar.gz: 1cf54d88358b06fdd8f9b2c78a2415820fc83a0f806ab16bd4a98b076b03fcc8bbf93e069d0f3cb5fc1337c8b5a682acbeca952c35b33df612200386a2ff0b68
+  metadata.gz: 71e2974457f43aca89266a3dde091a0306db1f1d8c5bee5ed9a69d3efc0dde87ef5386023acf19f6864860383d01158b88aeda3a6607719c7ccababc1277fdf3
+  data.tar.gz: a0b4b25fccb960ec88a9733fe34610e27a7d984c53fc79c3690b55a2cb508b0b7f705963877be2a79faf39f09ba3c7e48bc75167c9122b138352506dcdfdb501

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.10 (2015-04-06)
+- Keep code newlines within Ruby multiline
+
 ## 0.2.9 (2015-04-04)
 - Keep code newlines with multiline
     - https://github.com/eagletmt/faml/issues/18

data/README.md

@@ -24,8 +24,16 @@ Or install it yourself as:
 
 ## Usage
 
+### Rails, sinatra
 Just replace your `gem 'haml'` with `gem 'faml'` .
 
+### middleman
+Since middleman has its own renderers, there's no easy way to use faml with middleman currently.
+
+### Others
+faml provide a [tilt](https://github.com/rtomayko/tilt) interface.
+If your framework uses tilt, you can use faml by replacing `gem 'haml'` with `gem 'faml'` .
+
 ## Incompatibilities
 There are several incompatibilities.
 

data/benchmark/compiling.rb

@@ -2,6 +2,7 @@
 require 'benchmark/ips'
 require 'haml'
 require 'faml'
+require 'hamlit'
 require 'slim'
 require 'escape_utils/html/haml'
 
@@ -16,6 +17,7 @@ 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) }
+  x.report('Hamlit') { Hamlit::Engine.new(escape_html: true).call(haml_code) }
   if slim_code
     x.report('Slim') { Slim::Engine.new.call(slim_code) }
   end

data/benchmark/rendering.rb

@@ -2,6 +2,7 @@
 require 'benchmark/ips'
 require 'haml'
 require 'faml'
+require 'hamlit'
 require 'slim'
 require 'escape_utils/html/haml'
 
@@ -20,6 +21,8 @@ Benchmark.ips do |x|
   obj.instance_eval %{
     def faml_array; #{Faml::Engine.new.call(haml_code)}; end
     def faml_string; #{Faml::Engine.new(generator: Temple::Generators::RailsOutputBuffer).call(haml_code)}; end
+    def hamlit_array; #{Hamlit::Engine.new(escape_html: true).call(haml_code)}; end
+    def hamlit_string; #{Hamlit::Engine.new(escape_html: true, generator: Temple::Generators::RailsOutputBuffer).call(haml_code)}; end
   }
   if slim_code
     obj.instance_eval %{
@@ -31,6 +34,8 @@ Benchmark.ips do |x|
   x.report('Haml') { obj.haml }
   x.report('Faml (Array)') { obj.faml_array }
   x.report('Faml (String)') { obj.faml_string }
+  x.report('Hamlit (Array)') { obj.hamlit_array }
+  x.report('Hamlit (String)') { obj.hamlit_string }
   if slim_code
     x.report('Slim (Array)') { obj.slim_array }
     x.report('Slim (String)') { obj.slim_string }

data/benchmark/slim.rb

@@ -2,6 +2,7 @@
 require 'benchmark/ips'
 require 'haml'
 require 'faml'
+require 'hamlit'
 require 'slim'
 require 'escape_utils/html/haml'
 
@@ -14,12 +15,14 @@ context = Context.new
 Haml::Engine.new(haml_code, ugly: true, escape_html: true).def_method(context, :haml)
 context.instance_eval %{
   def faml; #{Faml::Engine.new(generator: Temple::Generators::RailsOutputBuffer).call(haml_code)}; end
+  def hamlit; #{Hamlit::Engine.new(escape_html: true, generator: Temple::Generators::RailsOutputBuffer).call(haml_code)}; end
   def slim; #{Slim::Engine.new(generator: Temple::Generators::RailsOutputBuffer).call(slim_code)}; end
 }
 
 Benchmark.ips do |x|
   x.report('Haml') { context.haml }
   x.report('Faml') { context.faml }
+  x.report('Hamlit') { context.hamlit }
   x.report('Slim') { context.slim }
   x.compare!
 end

data/faml.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "coffee-script"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "haml"  # for benchmark
+  spec.add_development_dependency "hamlit"  # for benchmark
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rake-compiler"
   spec.add_development_dependency "redcarpet"

data/lib/faml/parser.rb

@@ -151,8 +151,8 @@ module Faml
         return
       end
       node = create_node(Ast::SilentScript)
-      node.script = text[/\A- *(.*)\z/, 1]
-      node.script += RubyMultiline.read(@line_parser, node.script)
+      script = text[/\A- *(.*)\z/, 1]
+      node.script = [script, *RubyMultiline.read(@line_parser, script)].join("\n")
       @ast << node
     end
 

data/lib/faml/ruby_multiline.rb

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

data/lib/faml/script_parser.rb

@@ -28,11 +28,11 @@ module Faml
         create_node(Ast::Text) { |t| t.text = text[2 .. -1].strip }
       else
         node = create_node(Ast::Script)
-        node.script = text[1 .. -1].lstrip
-        if node.script.empty?
+        script = text[1 .. -1].lstrip
+        if script.empty?
           syntax_error!('No Ruby code to evaluate')
         end
-        node.script += RubyMultiline.read(@line_parser, node.script)
+        node.script = [script, *RubyMultiline.read(@line_parser, script)].join("\n")
         node
       end
     end
@@ -43,11 +43,11 @@ module Faml
         create_node(Ast::Text) { |t| t.text = text[3 .. -1].lstrip }
       when text[1] == '=' || text[1] == '~'
         node = create_node(Ast::Script)
-        node.script = text[2 .. -1].lstrip
-        if node.script.empty?
+        script = text[2 .. -1].lstrip
+        if script.empty?
           syntax_error!('No Ruby code to evaluate')
         end
-        node.script += RubyMultiline.read(@line_parser, node.script)
+        node.script = [script, *RubyMultiline.read(@line_parser, script)].join("\n")
         node.preserve = text[1] == '~'
         node
       else
@@ -65,11 +65,11 @@ module Faml
       when text[1] == '=' || text[1] == '~'
         node = create_node(Ast::Script)
         node.escape_html = false
-        node.script = text[2 .. -1].lstrip
-        if node.script.empty?
+        script = text[2 .. -1].lstrip
+        if script.empty?
           syntax_error!('No Ruby code to evaluate')
         end
-        node.script += RubyMultiline.read(@line_parser, node.script)
+        node.script = [script, *RubyMultiline.read(@line_parser, script)].join("\n")
         node.preserve = text[1] == '~'
         node
       else

data/lib/faml/version.rb

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

data/spec/compiler_newline_spec.rb

@@ -195,6 +195,15 @@ HAML
   'bar ' + |
   __LINE__.to_s |
 = __LINE__
+HAML
+      end
+
+      it 'keeps newlines in Ruby multiline' do
+        expect(render_string(<<HAML)).to eq("1 2 3\n<span>4</span>\n")
+= [__LINE__,
+  __LINE__,
+  __LINE__].join(' ')
+%span= __LINE__
 HAML
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faml
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-04 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hamlit
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -433,7 +447,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Faster implementation of Haml template language.