hamlit-block 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e4499cd2e559e092beed6aa9c5ad3e259b1ccfa
-  data.tar.gz: 1729f636eb93b49ec840b13cb3da49a338d635a2
+  metadata.gz: 1abd0ce08b2e4ff7e417ff0d4b3b2b1fabfcf073
+  data.tar.gz: 1088a092796c1cb6b49531f15dce6555ec177006
 SHA512:
-  metadata.gz: e70812d43c13940a1ae0e98f47344a70fa84d61403cefbd7b157ec686872d5b6b422c702084338651c25df3abf41e070fb78a042b6dd5eecc64859080b6cd87e
-  data.tar.gz: 6fb701cfde8af3e2f2b62f5023e5fe91511414b0a3cafdc30aa243c23faaf63bc1fbf6b6c8c2bde3c1b9c7fed011faa47ab4f3c8c9019dbf688ee4ee1c9c03ef
+  metadata.gz: 27f0f46ae8b05d9178975192cc837ab6f48244434e5bdd95979449dbb0d0aa52cd2334267ce006d1b9932e39f17464f5ad79eb7b8fe7d5a164643fd40280f7a7
+  data.tar.gz: 67a602550adaa07b2626597781845067f908b736ce3fcdf3554c5585a2c8e4ec72aa269987097ee182b309f19282bf5bc0c4c6dec7226e8881ab8528b4621d91

data/lib/hamlit/block.rb

@@ -1,10 +1,15 @@
 require "hamlit"
+require "hamlit/block/compiler_extension"
 require "hamlit/block/script_compiler_extension"
+require "hamlit/block/silent_script_compiler_extension"
 require "hamlit/block/version"
 
 module Hamlit
   class Compiler
+    prepend Block::CompilerExtension
+
     ScriptCompiler.send(:prepend, Block::ScriptCompilerExtension)
+    SilentScriptCompiler.send(:prepend, Block::SilentScriptCompilerExtension)
   end
 
   # Maybe hamlit-block's users expect this. This is Haml's default.

data/lib/hamlit/block/compiler_extension.rb

@@ -0,0 +1,11 @@
+module Hamlit
+  module Block
+    # Set identity for SilentScriptCompilerExtension
+    module CompilerExtension
+      def initialize(*)
+        super
+        @silent_script_compiler.identity = @script_compiler.identity
+      end
+    end
+  end
+end

data/lib/hamlit/block/script_compiler_extension.rb

@@ -2,6 +2,8 @@ module Hamlit
   module Block
     # Suppress block's internal rendering result and pass it to [:capture, ...].
     module ScriptCompilerExtension
+      attr_reader :identity
+
       def compile_script_assign(var, node, &block)
         if node.children.empty?
           super

data/lib/hamlit/block/silent_script_compiler_extension.rb

@@ -0,0 +1,26 @@
+module Hamlit
+  module Block
+    # Suppress block's internal rendering result and pass it to [:capture, ...].
+    # if it script is `do .. end` block
+    module SilentScriptCompilerExtension
+      attr_writer :identity
+
+      BLOCK_REGEX = /do(\s*\|\s*[^\|]*\s*\|)?\s*\z/
+
+      def compile_with_children(node, &block)
+        if node.value[:text] =~ BLOCK_REGEX
+          [:multi,
+           [:block, node.value[:text],
+            [:multi,
+             [:newline],
+             [:capture, @identity.generate, yield(node)],
+            ],
+           ]
+          ]
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/hamlit/block/version.rb

@@ -1,5 +1,5 @@
 module Hamlit
   module Block
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit-block
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hamlit
@@ -118,7 +118,9 @@ files:
 - bin/setup
 - hamlit-block.gemspec
 - lib/hamlit/block.rb
+- lib/hamlit/block/compiler_extension.rb
 - lib/hamlit/block/script_compiler_extension.rb
+- lib/hamlit/block/silent_script_compiler_extension.rb
 - lib/hamlit/block/version.rb
 homepage: https://github.com/hamlit/hamlit-block
 licenses:
@@ -140,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Hamlit extension to support capturing via yield