hamlit-block 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3a214d50595a9d3efee68fc6f3853c83e36951f
-  data.tar.gz: ed5b31078d28eb7660db2aff0a87f8b44bd16865
+  metadata.gz: 1b62b48437a95c5a66b0a728ddc1bcd37aeaec64
+  data.tar.gz: 46b1e5a1cf26f7730bc9343e3f601e17ab029b5e
 SHA512:
-  metadata.gz: 107409a95dd93bcc2a0a76185662de5fc1cc5ccc7c1b4ccd2401974d8dec2d69a00e4f55af4a9cf31160f96b1c19acdab96809c7cc6ef85398d59cf7f4a0bc01
-  data.tar.gz: 83c5c6738d03e05d1283ab43253685d7a187a0e15ef66eba333155bd906cc427a4b717dc322630884c273c0c9d2050bddf0fc629898f31bbd91aa1d553a35538
+  metadata.gz: fe5f0360b02aa69724a86bcc178dfca4d4eaab15bcc67803401e18f017a12cb55dd1af8d0f716ebb4a8d48f813fa19a10145007c6d02a2a9d3a97fb9a1c97a46
+  data.tar.gz: 28a7067b9bad5707fee6b06c8cf6cf19176857c354bb3bca05525fc37e280154553e75d1bcad8237ebf2e7f8c4928aaa4d5786ec8311064d4ee012f8170dfa1c

data/README.md

@@ -16,7 +16,9 @@ And then execute:
 
 ## Usage
 
-Basically the same as Hamlit. `require 'hamlit/block'` may be necessary. Contents inside script block is not rendered but available via `yield`.
+Basically the same as Hamlit. `require 'hamlit/block'` may be necessary. Contents inside script block is not rendered but available via `yield`. 
+
+See [spec](spec/hamlit/block_spec.rb) for detail.
 
 ## License
 

data/bin/console

@@ -3,12 +3,5 @@
 require "bundler/setup"
 require "hamlit/block"
 
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start
+require "pry"
+Pry.start

data/hamlit-block.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "hamlit", "~> 2.0"
+  spec.add_dependency "hamlit", ">= 2"
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "pry"

data/lib/hamlit/block.rb

@@ -1,17 +1,3 @@
 require "hamlit"
-require "hamlit/block/compiler_extension"
-require "hamlit/block/script_compiler_extension"
-require "hamlit/block/silent_script_compiler_extension"
+require "hamlit/block/engine"
 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.
-  Engine.options[:escape_html] = false
-end

data/lib/hamlit/block/compiler.rb

@@ -0,0 +1,20 @@
+require 'hamlit/block/script_compiler'
+require 'hamlit/block/silent_script_compiler'
+
+module Hamlit
+  module Block
+    class Compiler < ::Hamlit::Compiler
+      def initialize(options = {})
+        super
+
+        # Re-generate identity for Hamlit::Block and share it
+        identity = Identity.new
+        @tag_compiler = ::Hamlit::Compiler::TagCompiler.new(identity, options)
+
+        # Replace internal compilers with Hamlit::Block's ones.
+        @script_compiler        = ::Hamlit::Block::ScriptCompiler.new(identity)
+        @silent_script_compiler = ::Hamlit::Block::SilentScriptCompiler.new(identity)
+      end
+    end
+  end
+end

data/lib/hamlit/block/engine.rb

@@ -0,0 +1,33 @@
+require 'hamlit/engine'
+require 'hamlit/block/compiler'
+
+module Hamlit
+  module Block
+    class Engine < Temple::Engine
+      define_options(
+        :buffer_class,
+        generator:    Temple::Generators::ArrayBuffer,
+        format:       :html,
+        attr_quote:   "'",
+        escape_html:  false,
+        escape_attrs: true,
+        autoclose:    %w(area base basefont br col command embed frame
+                         hr img input isindex keygen link menuitem meta
+                         param source track wbr),
+        filename:     "",
+      )
+
+      use Hamlit::Parser
+      use Hamlit::Block::Compiler
+      use Hamlit::HTML
+      use Hamlit::StringSplitter
+      use Hamlit::StaticAnalyzer
+      use Hamlit::Escapable
+      use Hamlit::ForceEscapable
+      filter :ControlFlow
+      filter :MultiFlattener
+      filter :StaticMerger
+      use :Generator, -> { options[:generator] }
+    end
+  end
+end

data/lib/hamlit/block/{script_compiler_extension.rb → script_compiler.rb}

@@ -1,9 +1,7 @@
 module Hamlit
   module Block
     # Suppress block's internal rendering result and pass it to [:capture, ...].
-    module ScriptCompilerExtension
-      attr_reader :identity
-
+    class ScriptCompiler < ::Hamlit::Compiler::ScriptCompiler
       def compile_script_assign(var, node, &block)
         if node.children.empty?
           super

data/lib/hamlit/block/{silent_script_compiler_extension.rb → silent_script_compiler.rb}

@@ -2,8 +2,10 @@ module Hamlit
   module Block
     # Suppress block's internal rendering result and pass it to [:capture, ...]
     # if the silent script is `do .. end` block
-    module SilentScriptCompilerExtension
-      attr_writer :identity
+    class SilentScriptCompiler < ::Hamlit::Compiler::SilentScriptCompiler
+      def initialize(identity)
+        @identity = identity
+      end
 
       BLOCK_REGEX = /do(\s*\|\s*[^\|]*\s*\|)?\s*\z/
 

data/lib/hamlit/block/version.rb

@@ -1,5 +1,14 @@
 module Hamlit
   module Block
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
+
+    begin
+      require 'cell/hamlit/version'
+    rescue LoadError
+    else
+      if Gem::Version.new(Cell::Hamlit::VERSION) <= Gem::Version.new('0.2')
+        raise NotImplementedError.new('hamlit-block does not support cells-hamlit <= 0.2. See https://github.com/trailblazer/cells-hamlit/issues/6')
+      end
+    end
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: hamlit-block
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-19 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hamlit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -112,9 +112,10 @@ 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/compiler.rb
+- lib/hamlit/block/engine.rb
+- lib/hamlit/block/script_compiler.rb
+- lib/hamlit/block/silent_script_compiler.rb
 - lib/hamlit/block/version.rb
 homepage: https://github.com/hamlit/hamlit-block
 licenses:
@@ -136,8 +137,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Hamlit extension to support capturing via yield
 test_files: []
+has_rdoc: 

data/lib/hamlit/block/compiler_extension.rb

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