hamlit 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 658acdc2d3ba2e0c67b1b51e181b27fc9b3ede4f
-  data.tar.gz: 05cd64cef646b2af0252dff93f68594816385e62
+  metadata.gz: 28e31e01cf12674dcc7b8330ff324e2a02c98c5d
+  data.tar.gz: 373c61913cd374e989b8c0a6f35ab36a59282920
 SHA512:
-  metadata.gz: 92ed91af56b3e423dd3cd317826872dff66987ee46351cb769196d730943ee19d93a15e2e9c07999bb9fdff7aaf5e071732c11aafafaf54d0cb40e5804d2bffa
-  data.tar.gz: 2ad62fc2df52f1d42c459136e295d25e3f74718232d5369c972024fa40655f7537b3d8d41cc562145ad1db28d682a247b19c96e7cc53cf1b1dfa9e25b40fc285
+  metadata.gz: 9330c82678ae6fd23fe70b15a3460f5a6df890fe0008d18f8f2396dd749c66defb62a32cfa46d57e0b5360172327c5c9793a66c186e47ea9cc9d00e6f62fdef8
+  data.tar.gz: 381b81db56a1e1230e84080c1d5eb1b70ede41b46f976708a69f15a556a483a62b801976c2f80e71980c46a4a930d933c43de7d9a8a39ef97370d3ec94dfdf95

data/.travis.yml

@@ -14,8 +14,6 @@ matrix:
       env: TASK=test
     - rvm: 2.2
       env: TASK=test
-    - rvm: 2.2
-      env: TASK=bench TEMPLATE=benchmark/dynamic_boolean_attribute.haml
     - rvm: 2.2
       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
@@ -31,7 +29,6 @@ matrix:
     - rvm: 2.2
       env: TASK=bench TEMPLATE=test/haml/templates/standard.haml COMPILE=1
   allow_failures:
-    - env: TASK=bench TEMPLATE=benchmark/dynamic_boolean_attribute.haml
     - env: TASK=bench TEMPLATE=benchmark/boolean_attribute.haml,benchmark/class_attribute.haml,benchmark/id_attribute.haml,benchmark/data_attribute.haml,benchmark/common_attribute.haml
     - 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
     - env: TASK=bench SLIM_BENCH=1

data/CHANGELOG.md

@@ -7,6 +7,23 @@ project adheres to [Semantic Versioning](http://semver.org/). This change log is
 ## [HEAD]
 - No changes
 
+## [2.1.0] - 2015-12-14
+
+## Added
+
+- `-I` and `-r` options are added to `hamlit render` command
+  [#37](https://github.com/k0kubun/hamlit/issues/37). *Thanks to @jhurliman*
+
+## Changed
+
+- Dropped obsolete `escape_utils` gem dependency
+  [#48](https://github.com/k0kubun/hamlit/pull/48). *Thanks to @eagletmt*
+
+## Fixed
+
+- Accept NUL character in attribute keys
+  [#49](https://github.com/k0kubun/hamlit/pull/49). *Thanks to @eagletmt*
+
 ## [2.0.2] - 2015-12-12
 
 ### Fixed

data/benchmark/ext/build_data.rb

@@ -9,7 +9,9 @@ require_relative '../utils/benchmark_ips_extension'
 h = { 'user' => { id: 1234, name: 'k0kubun' }, book_id: 5432 }
 
 Benchmark.ips do |x|
-  x.report("Faml::AB.build")    { Faml::AttributeBuilder.build("'", true, nil, data: h) }
-  x.report("Hamlit.build_data") { Hamlit::AttributeBuilder.build_data(true, "'", h) }
+  quote = "'"
+  faml_options = { data: h }
+  x.report("Faml::AB.build")    { Faml::AttributeBuilder.build(quote, true, nil, faml_options) }
+  x.report("Hamlit.build_data") { Hamlit::AttributeBuilder.build_data(true, quote, h) }
   x.compare!
 end

data/ext/hamlit/hamlit.c

@@ -29,9 +29,9 @@ delete_falsey_values(VALUE values)
 }
 
 static int
-str_eq(VALUE str, const char *cstr)
+str_eq(VALUE str, const char *cstr, long n)
 {
-  return strcmp(RSTRING_PTR(str), cstr) == 0;
+  return RSTRING_LEN(str) == n && memcmp(RSTRING_PTR(str), cstr, n) == 0;
 }
 
 static VALUE
@@ -303,7 +303,7 @@ merge_all_attrs_i(VALUE key, VALUE value, VALUE merged)
   VALUE array;
 
   key = to_s(key);
-  if (str_eq(key, "id") || str_eq(key, "class") || str_eq(key, "data")) {
+  if (str_eq(key, "id", 2) || str_eq(key, "class", 5) || str_eq(key, "data", 4)) {
     array = rb_hash_aref(merged, key);
     if (NIL_P(array)) {
       array = rb_ary_new2(1);
@@ -333,7 +333,7 @@ int
 is_boolean_attribute(VALUE key)
 {
   VALUE boolean_attributes;
-  if (str_eq(rb_str_substr(key, 0, 5), "data-")) return 1;
+  if (str_eq(rb_str_substr(key, 0, 5), "data-", 5)) return 1;
 
   boolean_attributes = rb_const_get(mAttributeBuilder, id_boolean_attributes);
   return RTEST(rb_ary_includes(boolean_attributes, key));
@@ -412,11 +412,11 @@ hamlit_build(VALUE escape_attrs, VALUE quote, VALUE format, VALUE object_ref, VA
   for (i = 0; i < RARRAY_LEN(keys); i++) {
     key   = rb_ary_entry(keys, i);
     value = rb_hash_aref(attrs, key);
-    if (str_eq(key, "id")) {
+    if (str_eq(key, "id", 2)) {
       hamlit_build_for_id(escape_attrs, quote, buf, value);
-    } else if (str_eq(key, "class")) {
+    } else if (str_eq(key, "class", 5)) {
       hamlit_build_for_class(escape_attrs, quote, buf, value);
-    } else if (str_eq(key, "data")) {
+    } else if (str_eq(key, "data", 4)) {
       hamlit_build_for_data(escape_attrs, quote, buf, value);
     } else if (is_boolean_attribute(key)) {
       hamlit_build_for_boolean(escape_attrs, quote, format, buf, key, value);

data/hamlit.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
   spec.extensions    = ['ext/hamlit/extconf.rb']
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'escape_utils'
   spec.add_dependency 'temple', '~> 0.7.6'
   spec.add_dependency 'thor'
   spec.add_dependency 'tilt'

data/lib/hamlit/cli.rb

@@ -4,7 +4,10 @@ require 'thor'
 module Hamlit
   class CLI < Thor
     desc 'render HAML', 'Render haml template'
+    option :load_path, type: :string, aliases: %w[-I]
+    option :require, type: :string, aliases: %w[-r]
     def render(file)
+      process_load_options
       code = generate_code(file)
       puts eval(code)
     end
@@ -27,6 +30,18 @@ module Hamlit
 
     private
 
+    def process_load_options
+      if options[:load_path]
+        options[:load_path].split(':').each do |dir|
+          $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir)
+        end
+      end
+
+      if options[:require]
+        require options[:require]
+      end
+    end
+
     def generate_code(file)
       template = File.read(file)
       if options[:actionview]

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = '2.0.2'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: escape_utils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: temple
   requirement: !ruby/object:Gem::Requirement