zrb 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d95c6b276edcdeb944acbb480dc0104d5cf0bd0
-  data.tar.gz: 8583aaf2793e75e1f4f8b4e2bb37a769243178b3
+  metadata.gz: ca74f2e1175ee6aea15e0f2eab11178c0b510a6d
+  data.tar.gz: d894764442ddb832d1a8f078a3ee67dd7557085d
 SHA512:
-  metadata.gz: 80a4758f359a27d984fd2b52d9120e132adccb17ebcea23c6c183d5ad36f21c73e2e82214d648c20f270fc21094b6f59eaa7c051666acbd5cd9c0af3803bc496
-  data.tar.gz: d3ecbb267cd5add08f970ae5659065d0114ecb58afe47534f0ea22cb2a2d2c68ff3e49c220a8c988cd7063eec1ba29e8518cf2c1e9fb7db7f7edf0b0ab1e8f7a
+  metadata.gz: f888660ba7a9d00df41066a320931d8eda2aa8008a633742e4ae069dc721d0de38eea3c64e89809120835fb084b4f27e0bf22edd4417bfc0ffea2ad08130b334
+  data.tar.gz: 9b1ccca72be9290cd7d5f5b9f79446ce46462a7faf4d7e787272360bc73c6d89b23c2c8574587a1b5a4425f32bf43f0c98ff3246f902c1a2bef0b9262bed202a

data/lib/zrb.rb

@@ -36,7 +36,7 @@ module ZRB
       while pos < data.size
         match = data.match(TOKEN, pos)
         raise SyntaxError, "#{filename}:#{lineno}: parse error" unless match
-        all, text, expr, statement_space, statement, _ = *match
+        all, text, expr, _, statement, statement_space = *match
         pos += all.size
 
         yield :text, text unless text.empty?
@@ -59,8 +59,6 @@ module ZRB
           pos = closing_pos + 1
         end
 
-        yield :newline if statement_space
-
         if statement
           case statement[0]
           when ?=
@@ -73,6 +71,8 @@ module ZRB
             yield :statement, statement
           end
         end
+
+        yield :newline if statement_space
       end 
     end
 
@@ -88,7 +88,7 @@ module ZRB
 
     def ensure_string
       if @state != :string
-        source << 'buffer.append_string("'
+        source << 'buffer << "'
         @state = :string
       end
     end
@@ -106,7 +106,7 @@ module ZRB
     end
 
     def append_ruby(ruby)
-      source << '");' if @state == :string
+      source << '";' if @state == :string
       source << ruby
       @state = :ruby
     end
@@ -129,11 +129,15 @@ module ZRB
         when :expression
           append_expr(value)
         when :block_expression
-          append_ruby("buffer.append=#{value};")
+          append_ruby("buffer.safe_append=#{value};")
         when :statement
           append_ruby("#{value};")
         when :newline
           append_newline
+        when :comment
+          # no nothing
+        else
+          raise "internal error: unknown parsing type"
         end
       end
 
@@ -160,17 +164,13 @@ module ZRB
       other.to_s
     end
 
-    def append=(other)
+    def safe_append=(other)
       self << escape(other)
     end
 
-    def append_string(other)
-      self << other
-    end
-
-    def capture(blk)
+    def capture(blk, *args)
       start = self.size
-      blk.call
+      blk.call(*args)
     ensure
       return self.slice!(start..-1)
     end

data/lib/zrb/version.rb

@@ -1,4 +1,4 @@
 module ZRB
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end
 

data/test/test_zrb.rb

@@ -67,6 +67,33 @@ world
     assert_equal "Hello second!", @res2.strip
   end
 
+  def test_line_numbers
+    t = Template.new { <<-EOF }
+    <? raise if a == 1 ?>
+    hello
+    <? raise if a == 3 ?>
+    <? if a == 6 ?>
+      bar
+      <? raise ?>
+    <? elsif a == 8 ?>
+      <? raise ?>
+      wat
+    <? end ?>
+    hello
+    world
+    <? raise ?>
+    EOF
+
+    [1, 3, 6, 8, 13].each do |lineno|
+      @buffer = Buffer.new
+      exc = assert_raises do
+        t.render(self, :a => lineno)
+      end
+      actual = exc.backtrace[0][/:(\d+)/, 1].to_i
+      assert_equal lineno, actual
+    end
+  end
+
   def test_expr
     @buffer = Buffer.new
     t = Template.new { 'Hello #{1 + 1}' }
@@ -74,18 +101,18 @@ world
   end
 
   def form_for(&blk)
-    "<form>#{@form_buffer.capture(blk).strip}</form>"
+    "<form>#{@form_buffer.capture(blk, "/awesome").strip}</form>"
   end
 
   def test_block_expr
     @form_buffer = @buffer = Buffer.new
-    t = Template.new { <<-EOF }
-    <?= form_for do ?>
-    Hello world!
+    t = Template.new { <<-'EOF' }
+    <?= form_for do |path| ?>
+    Hello #{path}!
     <? end ?>
     EOF
 
-    assert_equal "<form>Hello world!</form>", t.render(self).strip
+    assert_equal "<form>Hello /awesome!</form>", t.render(self).strip
   end
 
   def test_html

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zrb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Magnus Holm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-22 00:00:00.000000000 Z
+date: 2017-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Simple template engine