hamlit 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b8b35eeaefa28bac22fe4535c4d33563974f734
-  data.tar.gz: 2c321cb4eafe5c6e0c7e913334867b46680b6510
+  metadata.gz: b22430fc90715fc9557d4cd0f63bf7cd616c43c4
+  data.tar.gz: aa4ce7df77eb79e02688a208b8efa8cfdf572c60
 SHA512:
-  metadata.gz: 4ee32ce74ac89cf0fe7142ffdf3321ce83f4d69806976f7bed04757b943f78434c2a36ab85dc6c9b8ae85594cdfc2e3cfe5ffeb5eba0c723a9e9ec2c0006dec8
-  data.tar.gz: a15d8443095adca91607fa58e82e1c03bfa8cc2a64df0244b76e630377f2360f3c6b58281978b3ca5340d34092477f3aefc6e9594a376b45736bc10c177ac25a
+  metadata.gz: 0b4d121ab0326143c3651727f7d122006389fd9064810aa38b8b9d251a92bba143ebe9582614fd76e2611e7b1a50e43d76bd904acbf18c0aa3096ada925d74ec
+  data.tar.gz: 512e91b9d64b94615f9fde9fec22145db8a8e8eeac74a663896cb43d1065d5e0f51ff4a61ffbd1e68e89896393f7cfc9a6e93564d302009c1d60988ba591d2e4

data/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/). This change log is based upon
 [keep-a-changelog](https://github.com/olivierlacan/keep-a-changelog).
 
+## [2.6.2](https://github.com/k0kubun/hamlit/compare/v2.6.1...v2.6.2) - 2016-08-27
+
+### Added
+
+- Add cdata filter
+  [#84](https://github.com/k0kubun/hamlit/issues/84). *Thanks to @shmargum*
+- Minimize string allocation on template comipilation using `# frozen_string_literal: true`
+
 ## [2.6.1](https://github.com/k0kubun/hamlit/compare/v2.6.0...v2.6.1) - 2016-08-18
 
 ### Fixed

data/lib/hamlit.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'hamlit/engine'
 require 'hamlit/error'
 require 'hamlit/version'

data/lib/hamlit/attribute_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'hamlit/hamlit'
 require 'hamlit/object_ref'
 require 'hamlit/utils'

data/lib/hamlit/attribute_compiler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'hamlit/attribute_builder'
 require 'hamlit/attribute_parser'
 require 'hamlit/ruby_expression'
@@ -41,11 +42,11 @@ module Hamlit
         values.select! { |_, exp| exp != nil }
 
         case key
-        when 'id'.freeze
+        when 'id'
           compile_id!(temple, key, values)
-        when 'class'.freeze
+        when 'class'
           compile_class!(temple, key, values)
-        when 'data'.freeze
+        when 'data'
           compile_data!(temple, key, values)
         when *AttributeBuilder::BOOLEAN_ATTRIBUTES, /\Adata-/
           compile_boolean!(temple, key, values)

data/lib/hamlit/attribute_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'hamlit/ruby_expression'
 
 module Hamlit
@@ -28,8 +29,8 @@ module Hamlit
 
     def wrap_bracket(text)
       text = text.strip
-      return text if text[0] == '{'.freeze
-      '{' << text << '}'.freeze
+      return text if text[0] == '{'
+      "{#{text}}"
     end
 
     def parse_key!(tokens)
@@ -38,10 +39,10 @@ module Hamlit
       when :on_sp
         parse_key!(tokens)
       when :on_label
-        str.tr(':'.freeze, ''.freeze)
+        str.tr(':', '')
       when :on_symbeg
         _, _, key = tokens.shift
-        assert_type!(tokens.shift, :on_tstring_end) if str != ':'.freeze
+        assert_type!(tokens.shift, :on_tstring_end) if str != ':'
         skip_until_hash_rocket!(tokens)
         key
       when :on_tstring_beg
@@ -64,7 +65,7 @@ module Hamlit
     def skip_until_hash_rocket!(tokens)
       until tokens.empty?
         _, type, str = tokens.shift
-        break if type == :on_op && str == '=>'.freeze
+        break if type == :on_op && str == '=>'
       end
     end
 

data/lib/hamlit/cli.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'hamlit'
 require 'thor'
 

data/lib/hamlit/compiler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'hamlit/compiler/children_compiler'
 require 'hamlit/compiler/comment_compiler'
 require 'hamlit/compiler/doctype_compiler'

data/lib/hamlit/compiler/children_compiler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hamlit
   class Compiler
     class ChildrenCompiler
@@ -101,7 +102,7 @@ module Hamlit
         when :script
           node.children.empty? && !nuke_inner_whitespace?(node)
         when :filter
-          !%w[ruby].freeze.include?(node.value[:name])
+          !%w[ruby].include?(node.value[:name])
         else
           false
         end

data/lib/hamlit/compiler/doctype_compiler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hamlit
   class Compiler
     class DoctypeCompiler

data/lib/hamlit/compiler/script_compiler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'hamlit/ruby_expression'
 require 'hamlit/static_analyzer'
 require 'hamlit/string_splitter'
@@ -69,7 +70,7 @@ module Hamlit
           [:multi,
            [:code, "#{var} = (#{node.value[:text]}"],
            [:newline],
-           [:code, ')'.freeze],
+           [:code, ')'],
           ]
         else
           [:multi,
@@ -84,7 +85,7 @@ module Hamlit
         if !node.value[:escape_html] && node.value[:preserve]
           result = find_and_preserve(result)
         else
-          result = '(' << result << ').to_s'.freeze
+          result = "(#{result}).to_s"
         end
         [:escape, node.value[:escape_html], [:dynamic, result]]
       end

data/lib/hamlit/compiler/silent_script_compiler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hamlit
   class Compiler
     class SilentScriptCompiler

data/lib/hamlit/compiler/tag_compiler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'hamlit/parser/haml_util'
 require 'hamlit/attribute_compiler'
 require 'hamlit/static_analyzer'
@@ -35,7 +36,7 @@ module Hamlit
           [:multi,
            [:code, "#{var} = (#{node.value[:value]}"],
            [:newline],
-           [:code, ')'.freeze],
+           [:code, ')'],
            [:escape, node.value[:escape_html], [:dynamic, var]]
           ]
         else

data/lib/hamlit/engine.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'temple'
 require 'hamlit/parser'
 require 'hamlit/compiler'

data/lib/hamlit/error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hamlit
   class Error < StandardError
     attr_reader :line

data/lib/hamlit/escapable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'hamlit/utils'
 
 module Hamlit

data/lib/hamlit/filters.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'hamlit/filters/base'
 require 'hamlit/filters/text_base'
 require 'hamlit/filters/tilt_base'
@@ -13,6 +14,7 @@ require 'hamlit/filters/preserve'
 require 'hamlit/filters/ruby'
 require 'hamlit/filters/sass'
 require 'hamlit/filters/scss'
+require 'hamlit/filters/cdata'
 
 module Hamlit
   class Filters
@@ -48,6 +50,7 @@ module Hamlit
     register :ruby,         Ruby
     register :sass,         Sass
     register :scss,         Scss
+    register :cdata,        Cdata
 
     def initialize(options = {})
       @options = options

data/lib/hamlit/filters/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'hamlit/parser/haml_util'
 
 module Hamlit

data/lib/hamlit/filters/cdata.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+module Hamlit
+  class Filters
+    class Cdata < TextBase
+      def compile(node)
+        compile_cdata(node)
+      end
+
+      private
+
+      def compile_cdata(node)
+        temple = [:multi]
+        temple << [:static, "<![CDATA[\n"]
+        compile_text!(temple, node, '    ')
+        temple << [:static, "\n]]>"]
+        temple
+      end
+    end
+  end
+end

data/lib/hamlit/filters/coffee.rb

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
 module Hamlit
   class Filters
     class Coffee < TiltBase
       def compile(node)
         require 'tilt/coffee' if explicit_require?
         temple = [:multi]
-        temple << [:static, "<script>\n".freeze]
+        temple << [:static, "<script>\n"]
         temple << compile_with_tilt(node, 'coffee', indent_width: 2)
-        temple << [:static, "</script>".freeze]
+        temple << [:static, "</script>"]
         temple
       end
     end

data/lib/hamlit/filters/css.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hamlit
   class Filters
     class Css < TextBase
@@ -14,17 +15,17 @@ module Hamlit
 
       def compile_html(node)
         temple = [:multi]
-        temple << [:static, "<style>\n".freeze]
-        compile_text!(temple, node, '  '.freeze)
-        temple << [:static, "\n</style>".freeze]
+        temple << [:static, "<style>\n"]
+        compile_text!(temple, node, '  ')
+        temple << [:static, "\n</style>"]
         temple
       end
 
       def compile_xhtml(node)
         temple = [:multi]
-        temple << [:static, "<style type='text/css'>\n  /*<![CDATA[*/\n".freeze]
-        compile_text!(temple, node, '    '.freeze)
-        temple << [:static, "\n  /*]]>*/\n</style>".freeze]
+        temple << [:static, "<style type='text/css'>\n  /*<![CDATA[*/\n"]
+        compile_text!(temple, node, '    ')
+        temple << [:static, "\n  /*]]>*/\n</style>"]
         temple
       end
     end

data/lib/hamlit/filters/erb.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hamlit
   class Filters
     class Erb < TiltBase

data/lib/hamlit/filters/escaped.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hamlit
   class Filters
     class Escaped < Base

data/lib/hamlit/filters/javascript.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hamlit
   class Filters
     class Javascript < TextBase
@@ -14,17 +15,17 @@ module Hamlit
 
       def compile_html(node)
         temple = [:multi]
-        temple << [:static, "<script>\n".freeze]
-        compile_text!(temple, node, '  '.freeze)
-        temple << [:static, "\n</script>".freeze]
+        temple << [:static, "<script>\n"]
+        compile_text!(temple, node, '  ')
+        temple << [:static, "\n</script>"]
         temple
       end
 
       def compile_xhtml(node)
         temple = [:multi]
-        temple << [:static, "<script type='text/javascript'>\n  //<![CDATA[\n".freeze]
-        compile_text!(temple, node, '    '.freeze)
-        temple << [:static, "\n  //]]>\n</script>".freeze]
+        temple << [:static, "<script type='text/javascript'>\n  //<![CDATA[\n"]
+        compile_text!(temple, node, '    ')
+        temple << [:static, "\n  //]]>\n</script>"]
         temple
       end
     end

data/lib/hamlit/filters/less.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # LESS support is deprecated since it requires therubyracer.gem,
 # which is hard to maintain.
 #
@@ -9,9 +10,9 @@ module Hamlit
       def compile(node)
         require 'tilt/less' if explicit_require?
         temple = [:multi]
-        temple << [:static, "<style>\n".freeze]
+        temple << [:static, "<style>\n"]
         temple << compile_with_tilt(node, 'less', indent_width: 2)
-        temple << [:static, "</style>".freeze]
+        temple << [:static, '</style>']
         temple
       end
     end

data/lib/hamlit/filters/plain.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'hamlit/string_splitter'
 
 module Hamlit

data/lib/hamlit/filters/preserve.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hamlit
   class Filters
     class Preserve < Base

data/lib/hamlit/filters/ruby.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hamlit
   class Filters
     class Ruby < Base

data/lib/hamlit/filters/sass.rb

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
 module Hamlit
   class Filters
     class Sass < TiltBase
       def compile(node)
         require 'tilt/sass' if explicit_require?
         temple = [:multi]
-        temple << [:static, "<style>\n".freeze]
+        temple << [:static, "<style>\n"]
         temple << compile_with_tilt(node, 'sass', indent_width: 2)
-        temple << [:static, "</style>".freeze]
+        temple << [:static, "</style>"]
         temple
       end
     end

data/lib/hamlit/filters/scss.rb

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
 module Hamlit
   class Filters
     class Scss < TiltBase
       def compile(node)
         require 'tilt/sass' if explicit_require?
         temple = [:multi]
-        temple << [:static, "<style>\n".freeze]
+        temple << [:static, "<style>\n"]
         temple << compile_with_tilt(node, 'scss', indent_width: 2)
-        temple << [:static, "</style>".freeze]
+        temple << [:static, "</style>"]
         temple
       end
     end

data/lib/hamlit/filters/text_base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hamlit
   class Filters
     class TextBase < Base

data/lib/hamlit/filters/tilt_base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'tilt'
 
 module Hamlit
@@ -6,7 +7,7 @@ module Hamlit
       def self.render(name, source, indent_width: 0)
         text = ::Tilt["t.#{name}"].new { source }.render
         return text if indent_width == 0
-        text.gsub!(/^/, ' '.freeze * indent_width)
+        text.gsub!(/^/, ' ' * indent_width)
       end
 
       def explicit_require?

data/lib/hamlit/force_escapable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'hamlit/escapable'
 
 module Hamlit

data/lib/hamlit/helpers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hamlit
   module Helpers
     extend self

data/lib/hamlit/html.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hamlit
   class HTML < Temple::HTML::Fast
     DEPRECATED_FORMATS = %i[html4 html5].freeze

data/lib/hamlit/identity.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hamlit
   class Identity
     def initialize

data/lib/hamlit/object_ref.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hamlit
   module ObjectRef
     class << self

data/lib/hamlit/parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Hamlit::Parser uses original Haml::Parser to generate Haml AST.
 # hamlit/parser/haml_* are modules originally in haml gem.
 

data/lib/hamlit/rails_helpers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'hamlit/helpers'
 
 # Currently this Hamlit::Helpers depends on

data/lib/hamlit/rails_template.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'temple'
 require 'hamlit/engine'
 require 'hamlit/rails_helpers'

data/lib/hamlit/railtie.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rails'
 
 module Hamlit

data/lib/hamlit/ruby_expression.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'ripper'
 
 module Hamlit

data/lib/hamlit/static_analyzer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'hamlit/ruby_expression'
 
 module Hamlit

data/lib/hamlit/template.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'temple'
 require 'hamlit/engine'
 require 'hamlit/helpers'

data/lib/hamlit/utils.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'hamlit/hamlit'
 
 module Hamlit

data/lib/hamlit/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hamlit
-  VERSION = '2.6.1'
+  VERSION = '2.6.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -309,6 +309,7 @@ files:
 - lib/hamlit/escapable.rb
 - lib/hamlit/filters.rb
 - lib/hamlit/filters/base.rb
+- lib/hamlit/filters/cdata.rb
 - lib/hamlit/filters/coffee.rb
 - lib/hamlit/filters/css.rb
 - lib/hamlit/filters/erb.rb