hamlit 0.5.3 → 0.6.0

data/spec/spec_helper.rb

@@ -2,16 +2,11 @@ require 'hamlit'
 require 'unindent'
 
 module HamlitSpecHelper
-  DEFAULT_OPTIONS = {
-    ugly: true,
-  }.freeze
-
   def parse_string(str)
     Hamlit::Parser.new.call(str)
   end
 
   def render_string(str, options = {})
-    options = DEFAULT_OPTIONS.merge(options)
     eval Hamlit::Engine.new(options).call(str)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Takashi Kokubun
@@ -311,7 +311,6 @@ files:
 - lib/hamlit/compilers/filter.rb
 - lib/hamlit/compilers/new_attribute.rb
 - lib/hamlit/compilers/old_attribute.rb
-- lib/hamlit/compilers/preserve.rb
 - lib/hamlit/compilers/runtime_attribute.rb
 - lib/hamlit/compilers/script.rb
 - lib/hamlit/compilers/strip.rb
@@ -320,7 +319,6 @@ files:
 - lib/hamlit/concerns/balanceable.rb
 - lib/hamlit/concerns/deprecation.rb
 - lib/hamlit/concerns/error.rb
-- lib/hamlit/concerns/escapable.rb
 - lib/hamlit/concerns/included.rb
 - lib/hamlit/concerns/indentable.rb
 - lib/hamlit/concerns/line_reader.rb
@@ -343,8 +341,7 @@ files:
 - lib/hamlit/filters/scss.rb
 - lib/hamlit/filters/tilt.rb
 - lib/hamlit/helpers.rb
-- lib/hamlit/html/pretty.rb
-- lib/hamlit/html/ugly.rb
+- lib/hamlit/html.rb
 - lib/hamlit/parser.rb
 - lib/hamlit/parsers/attribute.rb
 - lib/hamlit/parsers/comment.rb
@@ -359,7 +356,6 @@ files:
 - lib/hamlit/template.rb
 - lib/hamlit/version.rb
 - spec/Rakefile
-- spec/hamlit/compilers/script_spec.rb
 - spec/hamlit/engine/comment_spec.rb
 - spec/hamlit/engine/doctype_spec.rb
 - spec/hamlit/engine/error_spec.rb
@@ -367,7 +363,6 @@ files:
 - spec/hamlit/engine/multiline_spec.rb
 - spec/hamlit/engine/new_attribute_spec.rb
 - spec/hamlit/engine/old_attributes_spec.rb
-- spec/hamlit/engine/preservation_spec.rb
 - spec/hamlit/engine/script_spec.rb
 - spec/hamlit/engine/silent_script_spec.rb
 - spec/hamlit/engine/tag_spec.rb
@@ -382,7 +377,7 @@ files:
 - spec/hamlit/filters/ruby_spec.rb
 - spec/hamlit/filters/sass_spec.rb
 - spec/hamlit/filters/scss_spec.rb
-- spec/hamlit/ugly_spec.rb
+- spec/hamlit/haml_spec.rb
 - spec/rails/.gitignore
 - spec/rails/.rspec
 - spec/rails/Gemfile
@@ -473,7 +468,6 @@ specification_version: 4
 summary: High Performance Haml Implementation
 test_files:
 - spec/Rakefile
-- spec/hamlit/compilers/script_spec.rb
 - spec/hamlit/engine/comment_spec.rb
 - spec/hamlit/engine/doctype_spec.rb
 - spec/hamlit/engine/error_spec.rb
@@ -481,7 +475,6 @@ test_files:
 - spec/hamlit/engine/multiline_spec.rb
 - spec/hamlit/engine/new_attribute_spec.rb
 - spec/hamlit/engine/old_attributes_spec.rb
-- spec/hamlit/engine/preservation_spec.rb
 - spec/hamlit/engine/script_spec.rb
 - spec/hamlit/engine/silent_script_spec.rb
 - spec/hamlit/engine/tag_spec.rb
@@ -496,7 +489,7 @@ test_files:
 - spec/hamlit/filters/ruby_spec.rb
 - spec/hamlit/filters/sass_spec.rb
 - spec/hamlit/filters/scss_spec.rb
-- spec/hamlit/ugly_spec.rb
+- spec/hamlit/haml_spec.rb
 - spec/rails/.gitignore
 - spec/rails/.rspec
 - spec/rails/Gemfile

data/lib/hamlit/compilers/preserve.rb

@@ -1,10 +0,0 @@
-module Hamlit
-  module Compilers
-    module Preserve
-      def on_haml_preserve(code)
-        code = "Hamlit::Helpers.find_and_preserve(#{code})"
-        [:dynamic, code]
-      end
-    end
-  end
-end

data/lib/hamlit/concerns/escapable.rb

@@ -1,17 +0,0 @@
-require 'hamlit/concerns/included'
-
-module Hamlit
-  module Concerns
-    module Escapable
-      extend Included
-
-      included do
-        define_options escape_html: false
-      end
-
-      def escape_html(exp, force_escape = false)
-        [:escape, force_escape || @options[:escape_html], exp]
-      end
-    end
-  end
-end

data/lib/hamlit/html/pretty.rb

@@ -1,49 +0,0 @@
-require 'hamlit/concerns/deprecation'
-require 'temple/html/pretty'
-
-# NOTE: This does not work and disabled by default.
-# Actually on_static is just a workaround. This should be totally rewritten.
-# Because pretty mode is not used on production and not so important,
-# it is not done for now.
-module Hamlit
-  module HTML
-    class Pretty < Temple::HTML::Pretty
-      include Concerns::Deprecation
-
-      def call(exp)
-        result = super(exp)
-        result << [:static, "\n"] if @added_newline
-        result
-      end
-
-      def on_static(exp)
-        if exp == "\n"
-          @added_newline = true
-          [:static, '']
-        else
-          [:static, exp]
-        end
-      end
-
-      def on_html_tag(name, attrs, content = nil)
-        if content.is_a?(Array) && content.first != :multi
-          return parse_oneline_tag(name, attrs, content)
-        end
-
-        super
-      end
-
-      private
-
-      def parse_oneline_tag(name, attrs, content)
-        name = name.to_s
-        closed = !content || (empty_exp?(content) && (@format == :xml || options[:autoclose].include?(name)))
-        result = [:multi, [:static, "<#{name}"], compile(attrs)]
-        result << [:static, (closed && @format != :html ? ' /' : '') + '>']
-        result << compile(content) if content
-        result << [:static, "</#{name}>"] if !closed
-        result
-      end
-    end
-  end
-end

data/lib/hamlit/html/ugly.rb

@@ -1,10 +0,0 @@
-require 'hamlit/concerns/deprecation'
-require 'temple/html/fast'
-
-module Hamlit
-  module HTML
-    class Ugly < Temple::HTML::Fast
-      include Concerns::Deprecation
-    end
-  end
-end

data/spec/hamlit/compilers/script_spec.rb

@@ -1,46 +0,0 @@
-describe Hamlit::Compiler do
-  describe 'script' do
-    let(:options) do
-      { force_escape: false, disable_escape: false }
-    end
-
-    it 'compiles hamlit script ast into assigning' do
-      assert_compile(
-        [:haml,
-         :script,
-         'link_to user_path do',
-         options,
-         [:static, 'user']],
-        [:multi,
-         [:code, "_hamlit_compiler0 = link_to user_path do"],
-         [:static, "user"],
-         [:escape, false, [:dynamic, "(_hamlit_compiler0).to_s"]]],
-      )
-    end
-
-    it 'compiles multiple hamlit scripts' do
-      assert_compile(
-        [:multi,
-         [:haml,
-          :script,
-          'link_to user_path do',
-          options,
-          [:static, 'user']],
-         [:haml,
-          :script,
-          'link_to repo_path do',
-          options,
-          [:static, 'repo']]],
-        [:multi,
-         [:multi,
-          [:code, "_hamlit_compiler0 = link_to user_path do"],
-          [:static, "user"],
-          [:escape, false, [:dynamic, "(_hamlit_compiler0).to_s"]]],
-         [:multi,
-          [:code, "_hamlit_compiler1 = link_to repo_path do"],
-          [:static, "repo"],
-          [:escape, false, [:dynamic, "(_hamlit_compiler1).to_s"]]]],
-      )
-    end
-  end
-end

data/spec/hamlit/engine/preservation_spec.rb

@@ -1,11 +0,0 @@
-describe Hamlit::Parser do
-  describe 'preservation' do
-    it 'renders whitespace preservation operator' do
-      assert_render(<<-'HAML', <<-HTML)
-        ~ "<code>hello\nworld</code>"
-      HAML
-        <code>hello&#x000A;world</code>
-      HTML
-    end
-  end
-end