hamlit 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17985d049789075f9ccaa498376e506980a85eba
-  data.tar.gz: 31d451aa5c850358ab1c752ab8bb670666b5a8fe
+  metadata.gz: ae467344339ea7b431086ed4b87764ae4b0a580e
+  data.tar.gz: 2fbd25588f7006d077e6dfd96ba2cf239dc49c0b
 SHA512:
-  metadata.gz: 2c7a0f41cc218efdfd399363b6c00cdee940b864056208ffb4f02207c0579e8eda75f6f2d77f0bef4fceb3570e79d4ae7b34544d00c1805ece39295b85c7e35b
-  data.tar.gz: 3065e24a52cc9ad34854ac0d3b4d17353fae2acdc2dd50d5a1c5b5cf4754a4137866be58c9e01b1a3d762644930384076c9d98648ac2bc00cc143147e8425627
+  metadata.gz: 8e9fd2852146dc3e1a89d4a473ee2ab3be195c9fedd4b10f94b3dfc93bb9a9b093c3b8320658e1d658ed3b440dbdd8939d0e1f6dc6cb6ecfeca1dbc934bd89ab
+  data.tar.gz: d63c28302915ff6b297899f93a60e95fa587b99bef7ea4e12509e3a0c3f711f8c806a7c987401790a64e59e056c43bb952a2452508c945a844436fd7c1a3d06c

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "ext/hamlit/houdini"]
 	path = ext/hamlit/houdini
-	url = https://github.com/vmg/houdini
+	url = https://github.com/k0kubun/houdini

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
-sudo: false
 cache: bundler
 branches:
   only:
@@ -14,21 +13,21 @@ matrix:
       env: TASK=test
     - rvm: 2.2
       env: TASK=test
-    - rvm: ruby-head
+    - rvm: 2.3.0
       env: TASK=test
-    - rvm: 2.2
+    - rvm: 2.3.0
       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.2
+    - rvm: 2.3.0
       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.2
+    - rvm: 2.3.0
       env: TASK=bench SLIM_BENCH=1
-    - rvm: 2.2
+    - rvm: 2.3.0
       env: TASK=bench TEMPLATE=benchmark/etc/attribute_builder.haml
-    - rvm: 2.2
+    - rvm: 2.3.0
       env: TASK=bench TEMPLATE=benchmark/etc/static_analyzer.haml
-    - rvm: 2.2
+    - rvm: 2.3.0
       env: TASK=bench TEMPLATE=benchmark/etc/string_interpolation.haml
-    - rvm: 2.2
+    - rvm: 2.3.0
       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,13 @@ 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.2.1](https://github.com/k0kubun/hamlit/compare/v2.1.2...v2.2.0) - 2016-02-06
+
+### Added
+
+- Support Windows
+  [#54](https://github.com/k0kubun/hamlit/issues/54). *Thanks to @francesco-loreti*
+
 ## [2.2.0](https://github.com/k0kubun/hamlit/compare/v2.1.2...v2.2.0) - 2015-12-24
 
 ### Added

data/Gemfile

@@ -3,18 +3,13 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in hamlit.gemspec
 gemspec
 
-# maintain compatibility against master
-gem 'haml', github: 'haml/haml'
-
 gem 'benchmark-ips', '2.3.0'
 gem 'minitest-line'
 gem 'pry-byebug'
 
-if File.exist?('hamlit1')
-  gem 'hamlit1', path: 'hamlit1'
-end
-
-if RUBY_VERSION >= '2.1.0'
+is_windows = RUBY_PLATFORM =~ /mswin|mingw|bccwin|wince/
+if RUBY_VERSION >= '2.1.0' && !is_windows
+  gem 'faml'
   gem 'lineprof'
   gem 'stackprof'
 end

data/README.md

@@ -2,6 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/hamlit.svg)](http://badge.fury.io/rb/hamlit)
 [![Build Status](https://travis-ci.org/k0kubun/hamlit.svg?branch=master)](https://travis-ci.org/k0kubun/hamlit)
+[![Build status](https://ci.appveyor.com/api/projects/status/2l936fqv7fkd1s0s/branch/master?svg=true)](https://ci.appveyor.com/project/k0kubun/hamlit/branch/master)
 
 Hamlit is a high performance [Haml](https://github.com/haml/haml) implementation.
 

data/Rakefile

@@ -1,5 +1,21 @@
 require 'bundler/setup'
 require 'bundler/gem_tasks'
+
+#
+# Prepend DevKit into compilation phase
+#
+if Gem.win_platform?
+  desc 'Activates DevKit'
+  task :devkit do
+    begin
+      require 'devkit'
+    rescue LoadError
+      abort 'Failed to load DevKit required for compilation'
+    end
+  end
+  task compile: :devkit
+end
+
 require 'rake/testtask'
 require 'rake/extensiontask'
 

data/appveyor.yml

@@ -0,0 +1,41 @@
+---
+
+version: "{build}"
+
+branches:
+  only:
+    - master
+
+install:
+  - set PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - echo %PATH%
+
+  - ruby --version
+  - where ruby
+
+  - gem update --system --no-document
+  - gem --version
+  - where gem
+
+  - gem install bundler --no-document
+  - bundler --version
+  - where bundler
+
+  - bundle install --jobs 3 --retry 3
+
+build_script:
+  - git submodule init
+  - git submodule update
+  - bundle exec rake compile
+
+test_script:
+  - bundle exec rake test
+
+environment:
+  matrix:
+    - ruby_version: 21-x64
+    - ruby_version: '22'
+    - ruby_version: 22-x64
+
+matrix:
+  fast_finish: true

data/bin/test

@@ -4,6 +4,7 @@ VERSIONS=(
   2.0.0
   2.1.7
   2.2.3
+  2.3.0
 )
 
 set -e

data/ext/hamlit/extconf.rb

@@ -7,7 +7,13 @@ $CFLAGS   << ' -Wall -Wextra'
 $srcs = %w[hamlit.c]
 Dir[File.join(houdini_dir, '*.c')].each do |path|
   src = File.basename(path)
-  FileUtils.ln_s(path, src, force: true)
+  begin
+    FileUtils.ln_s(path, src, force: true)
+  rescue NotImplementedError
+    # For the error on windows:
+    # symlink() function is unimplemented on this machine (NotImplementedError)
+    FileUtils.cp(path, src)
+  end
   $srcs << src
 end
 

data/ext/hamlit/houdini/buffer.c

@@ -242,7 +242,7 @@ void gh_buf_attach(gh_buf *buf, char *ptr, size_t asize)
 
 int gh_buf_cmp(const gh_buf *a, const gh_buf *b)
 {
-	int result = memcmp(a->ptr, b->ptr, MIN(a->size, b->size));
+	int result = memcmp(a->ptr, b->ptr, a->size < b->size ? a->size : b->size);
 	return (result != 0) ? result :
 		(a->size < b->size) ? -1 : (a->size > b->size) ? 1 : 0;
 }

data/hamlit.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/k0kubun/hamlit'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|hamlit1|sample)/}) } + `git -C ext/hamlit/houdini ls-files -z`.split("\x0").map { |path| "ext/hamlit/houdini/#{path}" }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|sample)/}) } + `git -C ext/hamlit/houdini ls-files -z`.split("\x0").map { |path| "ext/hamlit/houdini/#{path}" }
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.extensions    = ['ext/hamlit/extconf.rb']
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'coffee-script'
   spec.add_development_dependency 'erubis'
-  spec.add_development_dependency 'faml'
+  spec.add_development_dependency 'haml', '4.1.0.beta.1'
   spec.add_development_dependency 'less'
   spec.add_development_dependency 'minitest-reporters', '~> 1.1'
   spec.add_development_dependency 'rails', '>= 4.0.0'
@@ -36,6 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'redcarpet'
   spec.add_development_dependency 'sass'
   spec.add_development_dependency 'slim'
-  spec.add_development_dependency 'therubyracer'
   spec.add_development_dependency 'unindent'
 end

data/lib/hamlit/compiler/script_compiler.rb

@@ -73,10 +73,9 @@ module Hamlit
           ]
         else
           [:multi,
-           [:code, "#{var} = #{node.value[:text]}"],
-           [:newline],
-           yield(node),
-           [:code, 'end'.freeze],
+           [:block, "#{var} = #{node.value[:text]}",
+            [:multi, [:newline], yield(node)],
+           ],
           ]
         end
       end

data/lib/hamlit/compiler/silent_script_compiler.rb

@@ -12,12 +12,11 @@ module Hamlit
       private
 
       def compile_with_children(node, &block)
-        temple = [:multi]
-        temple << [:code, node.value[:text]]
-        temple << [:newline]
-        temple << yield(node)
-        temple << [:code, 'end']
-        temple
+        [:multi,
+         [:block, node.value[:text],
+          [:multi, [:newline], yield(node)],
+         ],
+        ]
       end
     end
   end

data/lib/hamlit/filters/less.rb

@@ -1,3 +1,8 @@
+# LESS support is deprecated since it requires therubyracer.gem,
+# which is hard to maintain.
+#
+# It's not supported in Sprockets 3.0+ too.
+# https://github.com/sstephenson/sprockets/pull/547
 module Hamlit
   class Filters
     class Less < TiltBase

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -95,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faml
+  name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.0.beta.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.0.beta.1
 - !ruby/object:Gem::Dependency
   name: less
   requirement: !ruby/object:Gem::Requirement
@@ -220,20 +220,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: therubyracer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: unindent
   requirement: !ruby/object:Gem::Requirement
@@ -266,6 +252,7 @@ files:
 - README.md
 - REFERENCE.md
 - Rakefile
+- appveyor.yml
 - benchmark/boolean_attribute.haml
 - benchmark/class_attribute.haml
 - benchmark/common_attribute.haml