hamlit 2.8.10 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9781542c57cf0b6dca33b3823113d76fe6ed1fd61e5d380f2be82037aa78fd74
-  data.tar.gz: 76071735c42f313f42c24833dc4c687a8832b66d6e03420d7080357a4fbea7d1
+  metadata.gz: 587d2b8d01739c5529f342f9f316b9d13dcec5c9ba4ca693072e83da857fdf20
+  data.tar.gz: 91372701c50b63c2acbcc0f259987da4200a444c33371b1908670edc4c02493f
 SHA512:
-  metadata.gz: 06ae78c58435116352cb4c74832e9ecf0ba91c06adb669e42f5c944acb7ccebcccc2d45e8a31c0d8da74292c51713e1ba24aa5e6a0e9fc6a439998cc29462be3
-  data.tar.gz: 9bdab2b20439608f7f1698393eb7770182506408a9e460b6b7d7602cbde71c1d3bbe98db6738105a56cf15ec1a063a78930d988e3d0241a8b4f960674cb5ff8b
+  metadata.gz: 19f57ff4a0c28e5c6759c54120b37104ae3e4eff9e92cde062da1f195b8c39e3ef38a1f1eef4276fff22bd0961dd1cac126c3bdc38ca03137475ff5cc101fdb9
+  data.tar.gz: 418735e4c178d9a7bf96d6bbc432a0f00da2fd4068df1bee01254a864f2675c9ebe05c5a391a78c9912095f17b666cb9e688b24e30f33b8390bb86741d9228b5

data/CHANGELOG.md

@@ -4,14 +4,21 @@ 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.8.10](https://github.com/k0kubun/hamlit/compare/v2.8.8...v2.8.9) - 2018-09-05
+## [2.9.0](https://github.com/k0kubun/hamlit/compare/v2.8.10...v2.9.0) - 2018-10-16
+
+### Added
+
+- Consider aria attribute as another attribute that supports hyphenation and boolean like data attribute.
+  [#57](https://github.com/k0kubun/hamlit/pull/57). *Thanks to @francesco-loreti*
+
+## [2.8.10](https://github.com/k0kubun/hamlit/compare/v2.8.9...v2.8.10) - 2018-09-05
 
 ### Fixed
 
 - Fix uninitialized constant error introduced in v2.8.9
   [#125](https://github.com/k0kubun/hamlit/pull/125). *Thanks to @vovchynniko*
 
-## [2.8.9](https://github.com/k0kubun/hamlit/compare/v2.8.8...v2.8.9) - 2018-09-05
+## [2.8.9](https://github.com/k0kubun/hamlit/compare/v2.8.8...v2.8.9) - 2018-09-05 [YANKED]
 
 ### Fixed
 

data/REFERENCE.md

@@ -82,7 +82,7 @@ But some helpers are supported on Rails. Some of not-implemented methods are pla
 
 ### Limited attributes hyphenation
 In Haml, `%a{ foo: { bar: 'baz' } }` is rendered as `<a foo-bar='baz'></a>`, whatever foo is.
-In Hamlit, this feature is supported only for data attribute. Hamlit renders `%a{ data: { foo: 'bar' } }`
+In Hamlit, this feature is supported only for aria and data attribute. Hamlit renders `%a{ data: { foo: 'bar' } }`
 as `<a data-foo='bar'></a>` because it's data attribute. This design allows us to reduce work on runtime
 and the idea is originally in [Faml](https://github.com/eagletmt/faml).
 
@@ -91,7 +91,7 @@ In Haml, `%a{ foo: false }` is rendered as `<a></a>`, whatever `foo` is.
 In Hamlit, this feature is supported for only boolean attributes, which are defined by
 http://www.w3.org/TR/xhtml1/guidelines.html or https://html.spec.whatwg.org/.
 The list is the same as `ActionView::Helpers::TagHelper::BOOLEAN_ATTRIBUTES`.
-In addition, data-\* is also regarded as boolean.
+In addition, aria-\* and data-\* is also regarded as boolean.
 
 Since `foo` is not boolean attribute, `%a{ foo: false }` is rendered as `<a foo='false'></a>`
 This is the same behavior as Rails helpers. Also for `%a{ foo: nil }`,
@@ -102,7 +102,7 @@ is the only difference between Faml and Hamlit.
 ## 5 Types of Attributes
 
 Haml has 3 types of attributes: id, class and others.
-In addition, Hamlit treats data and boolean attributes specially.
+In addition, Hamlit treats aria/data and boolean attributes specially.
 So there are 5 types of attributes in Hamlit.
 
 ### id attribute
@@ -143,7 +143,7 @@ and merging multiple classes results in unique alphabetical sort.
 <div class=''></div>
 ```
 
-### data attribute
+### aria / data attribute
 Completely compatible with Haml, hyphenation and boolean are supported.
 
 ```rb
@@ -156,6 +156,8 @@ Completely compatible with Haml, hyphenation and boolean are supported.
 <div data-foo='bar'></div>
 ```
 
+aria attribute works in the same way as data attribute.
+
 ### boolean attributes
 No hyphenation but complete boolean support.
 

data/ext/hamlit/hamlit.c

@@ -5,9 +5,10 @@
 
 VALUE mAttributeBuilder, mObjectRef;
 static ID id_flatten, id_keys, id_parse, id_prepend, id_tr, id_uniq_bang;
-static ID id_data, id_equal, id_hyphen, id_space, id_underscore;
+static ID id_aria, id_data, id_equal, id_hyphen, id_space, id_underscore;
 static ID id_boolean_attributes, id_xhtml;
 
+static VALUE str_aria()        { return rb_const_get(mAttributeBuilder, id_aria); }
 static VALUE str_data()        { return rb_const_get(mAttributeBuilder, id_data); }
 static VALUE str_equal()       { return rb_const_get(mAttributeBuilder, id_equal); }
 static VALUE str_hyphen()      { return rb_const_get(mAttributeBuilder, id_hyphen); }
@@ -166,32 +167,45 @@ hamlit_build_class(VALUE escape_attrs, VALUE array)
   }
 }
 
+struct merge_data_attrs_var {
+  VALUE merged;
+  VALUE key_str;
+};
+
 static int
-merge_data_attrs_i(VALUE key, VALUE value, VALUE merged)
+merge_data_attrs_i(VALUE key, VALUE value, VALUE ptr)
 {
+  struct merge_data_attrs_var *arg = (struct merge_data_attrs_var *)ptr;
+  VALUE merged = arg->merged;
+  VALUE key_str = arg->key_str;
+
   if (NIL_P(key)) {
-    rb_hash_aset(merged, str_data(), value);
+    rb_hash_aset(merged, key_str, value);
   } else {
-    key = rb_str_concat(rb_str_new_cstr("data-"), to_s(key));
+    key = rb_str_concat(rb_str_concat(rb_str_dup(key_str), rb_str_new_cstr("-")), to_s(key));
     rb_hash_aset(merged, key, value);
   }
   return ST_CONTINUE;
 }
 
 static VALUE
-merge_data_attrs(VALUE values)
+merge_data_attrs(VALUE values, VALUE key_str)
 {
   long i;
   VALUE value, merged = rb_hash_new();
 
   for (i = 0; i < RARRAY_LEN(values); i++) {
+    struct merge_data_attrs_var arg;
+    arg.merged = merged;
+    arg.key_str = key_str;
+
     value = rb_ary_entry(values, i);
     switch (TYPE(value)) {
       case T_HASH:
-        rb_hash_foreach(value, merge_data_attrs_i, merged);
+        rb_hash_foreach(value, merge_data_attrs_i, (VALUE)&arg);
         break;
       default:
-        rb_hash_aset(merged, str_data(), value);
+        rb_hash_aset(merged, key_str, value);
         break;
     }
   }
@@ -255,12 +269,12 @@ flatten_data_attrs(VALUE attrs)
 }
 
 static VALUE
-hamlit_build_data(VALUE escape_attrs, VALUE quote, VALUE values)
+hamlit_build_data(VALUE escape_attrs, VALUE quote, VALUE values, VALUE key_str)
 {
   long i;
   VALUE attrs, buf, keys, key, value;
 
-  attrs = merge_data_attrs(values);
+  attrs = merge_data_attrs(values, key_str);
   attrs = flatten_data_attrs(attrs);
   keys  = rb_ary_sort_bang(rb_funcall(attrs, id_keys, 0));
   buf   = rb_str_new("", 0);
@@ -304,7 +318,7 @@ merge_all_attrs_i(VALUE key, VALUE value, VALUE merged)
   VALUE array;
 
   key = to_s(key);
-  if (str_eq(key, "id", 2) || str_eq(key, "class", 5) || str_eq(key, "data", 4)) {
+  if (str_eq(key, "id", 2) || str_eq(key, "class", 5) || str_eq(key, "data", 4) || str_eq(key, "aria", 4)) {
     array = rb_hash_aref(merged, key);
     if (NIL_P(array)) {
       array = rb_ary_new2(1);
@@ -338,6 +352,7 @@ is_boolean_attribute(VALUE key)
 {
   VALUE boolean_attributes;
   if (str_eq(rb_str_substr(key, 0, 5), "data-", 5)) return 1;
+  if (str_eq(rb_str_substr(key, 0, 5), "aria-", 5)) return 1;
 
   boolean_attributes = rb_const_get(mAttributeBuilder, id_boolean_attributes);
   return RTEST(rb_ary_includes(boolean_attributes, key));
@@ -364,7 +379,13 @@ hamlit_build_for_class(VALUE escape_attrs, VALUE quote, VALUE buf, VALUE values)
 void
 hamlit_build_for_data(VALUE escape_attrs, VALUE quote, VALUE buf, VALUE values)
 {
-  rb_str_concat(buf, hamlit_build_data(escape_attrs, quote, values));
+  rb_str_concat(buf, hamlit_build_data(escape_attrs, quote, values, str_data()));
+}
+
+void
+hamlit_build_for_aria(VALUE escape_attrs, VALUE quote, VALUE buf, VALUE values)
+{
+  rb_str_concat(buf, hamlit_build_data(escape_attrs, quote, values, str_aria()));
 }
 
 void
@@ -422,6 +443,8 @@ hamlit_build(VALUE escape_attrs, VALUE quote, VALUE format, VALUE object_ref, VA
       hamlit_build_for_class(escape_attrs, quote, buf, value);
     } else if (str_eq(key, "data", 4)) {
       hamlit_build_for_data(escape_attrs, quote, buf, value);
+    } else if (str_eq(key, "aria", 4)) {
+      hamlit_build_for_aria(escape_attrs, quote, buf, value);
     } else if (is_boolean_attribute(key)) {
       hamlit_build_for_boolean(escape_attrs, quote, format, buf, key, value);
     } else {
@@ -454,6 +477,17 @@ rb_hamlit_build_class(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self))
   return hamlit_build_class(argv[0], array);
 }
 
+static VALUE
+rb_hamlit_build_aria(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self))
+{
+  VALUE array;
+
+  rb_check_arity(argc, 2, UNLIMITED_ARGUMENTS);
+  rb_scan_args(argc - 2, argv + 2, "*", &array);
+
+  return hamlit_build_data(argv[0], argv[1], array, str_aria());
+}
+
 static VALUE
 rb_hamlit_build_data(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self))
 {
@@ -462,7 +496,7 @@ rb_hamlit_build_data(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self))
   rb_check_arity(argc, 2, UNLIMITED_ARGUMENTS);
   rb_scan_args(argc - 2, argv + 2, "*", &array);
 
-  return hamlit_build_data(argv[0], argv[1], array);
+  return hamlit_build_data(argv[0], argv[1], array, str_data());
 }
 
 static VALUE
@@ -490,6 +524,7 @@ Init_hamlit(void)
   rb_define_singleton_method(mAttributeBuilder, "build", rb_hamlit_build, -1);
   rb_define_singleton_method(mAttributeBuilder, "build_id", rb_hamlit_build_id, -1);
   rb_define_singleton_method(mAttributeBuilder, "build_class", rb_hamlit_build_class, -1);
+  rb_define_singleton_method(mAttributeBuilder, "build_aria", rb_hamlit_build_aria, -1);
   rb_define_singleton_method(mAttributeBuilder, "build_data", rb_hamlit_build_data, -1);
 
   id_flatten   = rb_intern("flatten");
@@ -499,6 +534,7 @@ Init_hamlit(void)
   id_tr        = rb_intern("tr");
   id_uniq_bang = rb_intern("uniq!");
 
+  id_aria       = rb_intern("ARIA");
   id_data       = rb_intern("DATA");
   id_equal      = rb_intern("EQUAL");
   id_hyphen     = rb_intern("HYPHEN");
@@ -508,6 +544,7 @@ Init_hamlit(void)
   id_boolean_attributes = rb_intern("BOOLEAN_ATTRIBUTES");
   id_xhtml = rb_intern("xhtml");
 
+  rb_const_set(mAttributeBuilder, id_aria,       rb_obj_freeze(rb_str_new_cstr("aria")));
   rb_const_set(mAttributeBuilder, id_data,       rb_obj_freeze(rb_str_new_cstr("data")));
   rb_const_set(mAttributeBuilder, id_equal,      rb_obj_freeze(rb_str_new_cstr("=")));
   rb_const_set(mAttributeBuilder, id_hyphen,     rb_obj_freeze(rb_str_new_cstr("-")));

data/lib/hamlit/attribute_compiler.rb

@@ -45,9 +45,9 @@ module Hamlit
           compile_id!(temple, key, values)
         when 'class'
           compile_class!(temple, key, values)
-        when 'data'
+        when 'data', 'aria'
           compile_data!(temple, key, values)
-        when *AttributeBuilder::BOOLEAN_ATTRIBUTES, /\Adata-/
+        when *AttributeBuilder::BOOLEAN_ATTRIBUTES, /\Adata-/, /\Aaria-/
           compile_boolean!(temple, key, values)
         else
           compile_common!(temple, key, values)
@@ -76,7 +76,7 @@ module Hamlit
 
     def compile_data!(temple, key, values)
       args = [@escape_attrs.inspect, "#{@quote.inspect}.freeze", values.map { |v| literal_for(v) }]
-      build_code = "::Hamlit::AttributeBuilder.build_data(#{args.join(', ')})"
+      build_code = "::Hamlit::AttributeBuilder.build_#{key}(#{args.join(', ')})"
 
       if values.all? { |type, exp| type == :static || Temple::StaticAnalyzer.static?(exp) }
         temple << [:static, eval(build_code).to_s]

data/lib/hamlit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.8.10
+  version: 2.9.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-05 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple