hamlit 2.7.3 → 2.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2c4f53ece3e84d4109c6ea4626a20b6cda6db07
-  data.tar.gz: 261a4ac4b9d913805a68ec61d2871418869074c0
+  metadata.gz: 2ab6a059796afc90a30c0e1ee9849266d7fdf1fb
+  data.tar.gz: 8c378702fb387e90139b7f06cf4a2f6ac79b27f9
 SHA512:
-  metadata.gz: c628cf49a624558f9e3d36b46d56c56d288c3634d4a7f87486ca440c3664e81176eabb686e17774a6a55af409fe714fdec9a1ab892b139bef3967861158ee396
-  data.tar.gz: 202b92fb6241ff2156ec0e946372502d4fcd432fe69e9cd947a157a8c18801da1bcf4d38f13e7f9ee606008dc665b391c2275f0df3a87ae14c0d334110606789
+  metadata.gz: 0a3850facd865215052496f265f1ea037aeb81cacb0a51c9427f3f1865d422493670513665c0ce3cfe789fa82deec9e4750b665c18b0c21c051260d4461770bc
+  data.tar.gz: f491cdfedee20750ac82fc492295d4aaa51d79f798286b984e52387826b8ceb41f4a5ad72ae81ea1eb20bdb2dde77958d81b286bd12e3bd3db33ad0b8db264fa

data/CHANGELOG.md

@@ -4,6 +4,19 @@ 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.7.5](https://github.com/k0kubun/hamlit/compare/v2.7.4...v2.7.5) - 2016-10-15
+
+### Fixed
+
+- Resurrect `Hamlit::RailsTemplate.set_options` dropped in v2.7.4 unexpectedly.
+
+## [2.7.4](https://github.com/k0kubun/hamlit/compare/v2.7.3...v2.7.4) - 2016-10-15 [YANKED]
+
+### Fixed
+
+- Compile template as xhtml when ActionView regards template as text/xml
+  [#92](https://github.com/k0kubun/hamlit/issues/92). *Thank to @shmargum*
+
 ## [2.7.3](https://github.com/k0kubun/hamlit/compare/v2.7.2...v2.7.3) - 2016-10-12
 
 ### Fixed

data/lib/hamlit/rails_template.rb

@@ -6,14 +6,36 @@ require 'hamlit/parser/haml_helpers'
 require 'hamlit/parser/haml_util'
 
 module Hamlit
-  RailsTemplate = Temple::Templates::Rails.create(
-    Hamlit::Engine,
-    generator:     Temple::Generators::RailsOutputBuffer,
-    register_as:   :haml,
-    use_html_safe: true,
-    streaming:     true,
-    buffer_class:  'ActionView::OutputBuffer',
-  )
+  class RailsTemplate
+    # Compatible with: https://github.com/judofyr/temple/blob/v0.7.7/lib/temple/mixins/options.rb#L15-L24
+    class << self
+      def options
+        @options ||= {
+          generator:     Temple::Generators::RailsOutputBuffer,
+          use_html_safe: true,
+          streaming:     true,
+          buffer_class:  'ActionView::OutputBuffer',
+        }
+      end
+
+      def set_options(opts)
+        options.update(opts)
+      end
+    end
+
+    def call(template)
+      options = RailsTemplate.options
+
+      # https://github.com/haml/haml/blob/4.0.7/lib/haml/template/plugin.rb#L19-L20
+      # https://github.com/haml/haml/blob/4.0.7/lib/haml/options.rb#L228
+      if template.respond_to?(:type) && template.type == 'text/xml'
+        options = options.merge(format: :xhtml)
+      end
+
+      Engine.new(options).call(template.source)
+    end
+  end
+  ActionView::Template.register_template_handler(:haml, RailsTemplate.new)
 
   # https://github.com/haml/haml/blob/4.0.7/lib/haml/template.rb
   module HamlHelpers

data/lib/hamlit/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hamlit
-  VERSION = '2.7.3'
+  VERSION = '2.7.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.7.3
+  version: 2.7.5
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -369,7 +369,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: High Performance Haml Implementation