hamlit 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f87b5f8e6806165838193859ece7aae9c3cc853
-  data.tar.gz: d1e391154cd95f4a287ad802fe33e06076bebfef
+  metadata.gz: 6b12c8ee8fbc97d9eda90e24db50496038942663
+  data.tar.gz: 1260b4dfc2f4db62b82d384bfd42fc47ca75469a
 SHA512:
-  metadata.gz: b4a909943b059a7382f73eaafbb827f30ab97103d0abdaf811552abe9d7f44bff637c8e6875150b0c74bb773a9fbfc9e1cb5a054d0f7536b3e322ca3aa5e281c
-  data.tar.gz: 9496a8dc72a52606a7bfb9e9e10748d88a5be4e39130277debea48ad6be7a10ee9f122c0228613822f7df1166b93c8c980ee26e08dc45b15d4385717de777867
+  metadata.gz: db8f07ad47026134dcf60aefd9cd27c31f22ab7f7027c3605c3e2f4243bac921f54374a22bb672a04ebf3119d251ec64b970910137f8544a76a75f8c5755aef9
+  data.tar.gz: 7d7f92c8050832f24e3e951fd4eddfea5e42863b00daaa808fb9fe69f9094300b5cf5a5c19f1a77adf15eb5c86e05809cb2c823d47fce4a443bb2ce2ce513435

data/.travis.yml

@@ -7,25 +7,25 @@ script:
   - "bundle exec rake $TASK"
 matrix:
   include:
-    - rvm: 2.1
+    - rvm: 2.1.10
       env: TASK=test
-    - rvm: 2.2
+    - rvm: 2.2.5
       env: TASK=test
-    - rvm: 2.3.0
+    - rvm: 2.3.1
       env: TASK=test
-    - rvm: 2.3.0
+    - rvm: 2.3.1
       env: TASK=bench TEMPLATE=benchmark/boolean_attribute.haml,benchmark/class_attribute.haml,benchmark/id_attribute.haml,benchmark/data_attribute.haml,benchmark/common_attribute.haml
-    - rvm: 2.3.0
+    - rvm: 2.3.1
       env: TASK=bench TEMPLATE=benchmark/dynamic_attributes/boolean_attribute.haml,benchmark/dynamic_attributes/class_attribute.haml,benchmark/dynamic_attributes/id_attribute.haml,benchmark/dynamic_attributes/data_attribute.haml,benchmark/dynamic_attributes/common_attribute.haml
-    - rvm: 2.3.0
+    - rvm: 2.3.1
       env: TASK=bench SLIM_BENCH=1
-    - rvm: 2.3.0
+    - rvm: 2.3.1
       env: TASK=bench TEMPLATE=benchmark/etc/attribute_builder.haml
-    - rvm: 2.3.0
+    - rvm: 2.3.1
       env: TASK=bench TEMPLATE=benchmark/etc/static_analyzer.haml
-    - rvm: 2.3.0
+    - rvm: 2.3.1
       env: TASK=bench TEMPLATE=benchmark/etc/string_interpolation.haml
-    - rvm: 2.3.0
+    - rvm: 2.3.1
       env: TASK=bench TEMPLATE=test/haml/templates/standard.haml COMPILE=1
   allow_failures:
     - env: TASK=bench TEMPLATE=benchmark/boolean_attribute.haml,benchmark/class_attribute.haml,benchmark/id_attribute.haml,benchmark/data_attribute.haml,benchmark/common_attribute.haml

data/CHANGELOG.md

@@ -4,6 +4,12 @@ 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.4.0](https://github.com/k0kubun/hamlit/compare/v2.3.1...v2.4.0) - 2016-05-13
+
+### Added
+
+- Add `Hamlit::Helpers.preserve` method for Tilt templates
+
 ## [2.3.1](https://github.com/k0kubun/hamlit/compare/v2.3.0...v2.3.1) - 2016-05-09
 
 ### Fixed

data/README.md

@@ -47,7 +47,7 @@ with C extension.
 
 ## Usage
 
-See [REFERENCE.md](REFERENCE.md) for detail features of Hamlit.
+Hamlit currently supports Ruby 2.1 and higher. See [REFERENCE.md](REFERENCE.md) for detail features of Hamlit.
 
 ### Rails
 

data/REFERENCE.md

@@ -62,6 +62,7 @@ for full features in original implementation.
   - [ ] :textile
   - [ ] Custom Filters
 - [ ] Helper Methods
+  - [x] preserve
   - [x] surround
   - [x] precede
   - [x] succeed

data/bin/test

@@ -1,9 +1,9 @@
 #!/bin/bash
 
 VERSIONS=(
-  2.1.7
-  2.2.3
-  2.3.0
+  2.1.10
+  2.2.5
+  2.3.1
 )
 
 set -e
@@ -16,7 +16,7 @@ function test_with() {
     bundle install
   fi
   ruby -v
-  rake test
+  bundle exec rake test
 }
 
 for version in ${VERSIONS[@]}; do

data/lib/hamlit/helpers.rb

@@ -0,0 +1,14 @@
+module Hamlit
+  module Helpers
+    extend self
+
+    # The same as original Haml::Helpers#preserve without block support.
+    def preserve(input)
+      # https://github.com/haml/haml/blob/4.1.0.beta.1/lib/haml/helpers.rb#L130-L133
+      s = input.to_s.chomp("\n")
+      s.gsub!(/\n/, '
')
+      s.delete!("\r")
+      s
+    end
+  end
+end

data/lib/hamlit/rails_helpers.rb

@@ -1,7 +1,10 @@
+require 'hamlit/helpers'
+
 # Currently this Hamlit::Helpers depends on
 # ActionView internal implementation. (not desired)
 module Hamlit
   module RailsHelpers
+    include Helpers
     extend self
 
     DEFAULT_PRESERVE_TAGS = %w[textarea pre code].freeze
@@ -23,10 +26,7 @@ module Hamlit
 
     def preserve(input = nil, &block)
       return preserve(capture_haml(&block)) if block
-      s = input.to_s.chomp("\n")
-      s.gsub!(/\n/, '
')
-      s.delete!("\r")
-      s
+      super
     end
 
     def surround(front, back = front, &block)

data/lib/hamlit/template.rb

@@ -1,5 +1,6 @@
 require 'temple'
 require 'hamlit/engine'
+require 'hamlit/helpers'
 
 # Load tilt/haml first to override if available
 begin
@@ -14,4 +15,13 @@ module Hamlit
     Hamlit::Engine,
     register_as: :haml,
   )
+
+  module TemplateExtension
+    # Activate Hamlit::Helpers for tilt templates.
+    # https://github.com/judofyr/temple/blob/v0.7.6/lib/temple/mixins/template.rb#L7-L11
+    def compile(*)
+      "extend Hamlit::Helpers; #{super}"
+    end
+  end
+  Template.send(:extend, TemplateExtension)
 end

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = '2.3.1'
+  VERSION = '2.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-08 00:00:00.000000000 Z
+date: 2016-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -342,6 +342,7 @@ files:
 - lib/hamlit/filters/scss.rb
 - lib/hamlit/filters/text_base.rb
 - lib/hamlit/filters/tilt_base.rb
+- lib/hamlit/helpers.rb
 - lib/hamlit/html.rb
 - lib/hamlit/identity.rb
 - lib/hamlit/object_ref.rb
@@ -390,3 +391,4 @@ signing_key:
 specification_version: 4
 summary: High Performance Haml Implementation
 test_files: []
+has_rdoc: