faml 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23f087ba97e9ffb104d240af74b6704fd100a5e8
-  data.tar.gz: 2e5f8a48de615415b4343fa7f818106b26f8d3ae
+  metadata.gz: b0b565977825d5840091b528c95126d1145470ff
+  data.tar.gz: 6d7bbd18e0915cdf9a9feb241c40009b85eacddb
 SHA512:
-  metadata.gz: 84c1f440f966f32e7163fe610317d5fa4da8d625204aa72b8e09488fd872c2b3d62ff26c2ff83ea3e743bc48d351257be80f02dbffcc44d219266417f6f6aa29
-  data.tar.gz: 4ff1f89b8bf2935abe157da73197c12614a32a7fadfb644b596d996868ebc4d99101243ae83b04833488734393522645125aabfb2b50409bd4d57fd35fa4644d
+  metadata.gz: ea2a871d173b410deccaa0d693f3a6c6aff6479a78e74c1424147a33ff64277eaf4652e921567bf75bc56f58b61148fe14d1f2149bfe62367f1eb9f023bf428a
+  data.tar.gz: fb9112e98d3df4146c058f2075498de3645ef480e1ebb5af2655775e3459d4f79b8291b2a2b82e12e758922b077063f14d63758cdd58bfc605a01242e819a8c4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.1 (2015-09-20)
+- Improve `Faml::AttributeBuilder.build` performance
+    - Reduce String allocations
+
 ## 0.3.0 (2015-09-13)
 - Move Haml parser and AST definition to haml_parser
     - https://github.com/eagletmt/haml_parser

data/ext/attribute_builder/attribute_builder.c

@@ -10,6 +10,7 @@
 
 VALUE rb_mAttributeBuilder;
 static ID id_keys, id_sort_bang, id_uniq_bang, id_merge_bang, id_temple, id_utils, id_escape_html, id_gsub, id_to_s;
+static ID id_id, id_class, id_underscore, id_hyphen, id_space, id_equal;
 
 static void
 concat_array_attribute(VALUE attributes, VALUE hash, VALUE key)
@@ -54,7 +55,7 @@ normalize_data_i2(VALUE key, VALUE value, VALUE ptr)
   struct normalize_data_i2_arg *arg = (struct normalize_data_i2_arg *)ptr;
   VALUE k = rb_funcall(arg->key, id_to_s, 0);
 
-  k = rb_funcall(k, id_gsub, 2, rb_str_new_cstr("_"), rb_str_new_cstr("-"));
+  k = rb_funcall(k, id_gsub, 2, rb_const_get(rb_mAttributeBuilder, id_underscore), rb_const_get(rb_mAttributeBuilder, id_hyphen));
   rb_str_cat(k, "-", 1);
   rb_str_append(k, key);
   rb_hash_aset(arg->normalized, k, value);
@@ -73,7 +74,7 @@ normalize_data_i(VALUE key, VALUE value, VALUE normalized)
     rb_hash_foreach(normalize_data(value), normalize_data_i2, (VALUE)(&arg));
   } else {
     key = rb_funcall(key, id_to_s, 0);
-    key = rb_funcall(key, id_gsub, 2, rb_str_new_cstr("_"), rb_str_new_cstr("-"));
+    key = rb_funcall(key, id_gsub, 2, rb_const_get(rb_mAttributeBuilder, id_underscore), rb_const_get(rb_mAttributeBuilder, id_hyphen));
     rb_hash_aset(normalized, key, value);
   }
   return ST_CONTINUE;
@@ -132,36 +133,32 @@ merge(VALUE attributes, int argc, VALUE *argv)
 
     Check_Type(argv[i], T_HASH);
     h = stringify_keys(argv[i]);
-    concat_array_attribute(attributes, h, rb_str_new_cstr("class"));
-    concat_array_attribute(attributes, h, rb_str_new_cstr("id"));
+    concat_array_attribute(attributes, h, rb_const_get(rb_mAttributeBuilder, id_class));
+    concat_array_attribute(attributes, h, rb_const_get(rb_mAttributeBuilder, id_id));
     normalize(h);
     rb_funcall(attributes, id_merge_bang, 1, h);
   }
 }
 
-static VALUE
-put_attribute(VALUE attr_quote, VALUE key, VALUE value)
+static void
+put_attribute(VALUE buf, VALUE attr_quote, VALUE key, VALUE value)
 {
-  VALUE utils_class, str;
-  long len;
+  VALUE utils_class;
 
   value = rb_funcall(value, id_to_s, 0);
   utils_class = rb_const_get(rb_const_get(rb_cObject, id_temple), id_utils);
   value = rb_funcall(utils_class, id_escape_html, 1, value);
 
-  len = 2 + 2*RSTRING_LEN(attr_quote) + RSTRING_LEN(key) + RSTRING_LEN(value);
-  str = rb_str_buf_new(len);
-  rb_str_buf_cat(str, " ", 1);
-  rb_str_buf_append(str, key);
-  rb_str_buf_cat(str, "=", 1);
-  rb_str_buf_append(str, attr_quote);
-  rb_str_buf_append(str, value);
-  rb_str_buf_append(str, attr_quote);
-  return str;
+  rb_ary_push(buf, rb_const_get(rb_mAttributeBuilder, id_space));
+  rb_ary_push(buf, key);
+  rb_ary_push(buf, rb_const_get(rb_mAttributeBuilder, id_equal));
+  rb_ary_push(buf, attr_quote);
+  rb_ary_push(buf, value);
+  rb_ary_push(buf, attr_quote);
 }
 
-static VALUE
-build_attribute(VALUE attr_quote, int is_html, VALUE key, VALUE value)
+static void
+build_attribute(VALUE buf, VALUE attr_quote, int is_html, VALUE key, VALUE value)
 {
   const char *key_cstr = StringValueCStr(key);
   if (strcmp(key_cstr, "class") == 0) {
@@ -169,9 +166,7 @@ build_attribute(VALUE attr_quote, int is_html, VALUE key, VALUE value)
 
     Check_Type(value, T_ARRAY);
     len = RARRAY_LEN(value);
-    if (len == 0) {
-      return rb_str_new_cstr("");
-    } else {
+    if (len != 0) {
       long i;
       VALUE ary = rb_ary_new_capa(len);
       for (i = 0; i < len; i++) {
@@ -180,39 +175,34 @@ build_attribute(VALUE attr_quote, int is_html, VALUE key, VALUE value)
       }
       rb_funcall(ary, id_sort_bang, 0);
       rb_funcall(ary, id_uniq_bang, 0);
-      return put_attribute(attr_quote, key, rb_ary_join(ary, rb_str_new_cstr(" ")));
+      put_attribute(buf, attr_quote, key, rb_ary_join(ary, rb_const_get(rb_mAttributeBuilder, id_space)));
     }
   } else if (strcmp(key_cstr, "id") == 0) {
     long len = RARRAY_LEN(value);
 
     Check_Type(value, T_ARRAY);
     len = RARRAY_LEN(value);
-    if (len == 0) {
-      return rb_str_new_cstr("");
-    } else {
+    if (len != 0) {
       long i;
       VALUE ary = rb_ary_new_capa(len);
       for (i = 0; i < len; i++) {
         VALUE v = RARRAY_AREF(value, i);
         rb_ary_push(ary, rb_funcall(v, id_to_s, 0));
       }
-      return put_attribute(attr_quote, key, rb_ary_join(ary, rb_str_new_cstr("_")));
+      put_attribute(buf, attr_quote, key, rb_ary_join(ary, rb_const_get(rb_mAttributeBuilder, id_underscore)));
     }
   } else if (RB_TYPE_P(value, T_TRUE)) {
     if (is_html) {
-      VALUE attr = rb_str_buf_new(1 + RSTRING_LEN(key));
-      rb_str_buf_cat(attr, " ", 1);
-      rb_str_buf_append(attr, key);
-      return attr;
+      rb_ary_push(buf, rb_const_get(rb_mAttributeBuilder, id_space));
+      rb_ary_push(buf, key);
     } else {
-      return put_attribute(attr_quote, key, key);
+      put_attribute(buf, attr_quote, key, key);
     }
   } else if (RB_TYPE_P(value, T_FALSE) || NIL_P(value)) {
-    return Qnil;
+    /* do nothing */
   } else {
-    return put_attribute(attr_quote, key, value);
+    put_attribute(buf, attr_quote, key, value);
   }
-  return value;
 }
 
 static VALUE
@@ -226,17 +216,17 @@ m_build(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self))
   attr_quote = argv[0];
   is_html = RTEST(argv[1]);
   attributes = rb_hash_new();
-  rb_hash_aset(attributes, rb_str_new_cstr("id"), rb_ary_new());
-  rb_hash_aset(attributes, rb_str_new_cstr("class"), rb_ary_new());
+  rb_hash_aset(attributes, rb_const_get(rb_mAttributeBuilder, id_id), rb_ary_new());
+  rb_hash_aset(attributes, rb_const_get(rb_mAttributeBuilder, id_class), rb_ary_new());
   merge(attributes, argc-2, argv+2);
 
   keys = rb_funcall(attributes, id_keys, 0);
   rb_funcall(keys, id_sort_bang, 0);
   len = RARRAY_LEN(keys);
-  buf = rb_ary_new_capa(len);
+  buf = rb_ary_new();
   for (i = 0; i < len; i++) {
     VALUE k = RARRAY_AREF(keys, i);
-    rb_ary_push(buf, build_attribute(attr_quote, is_html, k, rb_hash_lookup(attributes, k)));
+    build_attribute(buf, attr_quote, is_html, k, rb_hash_lookup(attributes, k));
   }
 
   return rb_ary_join(buf, Qnil);
@@ -265,5 +255,20 @@ Init_attribute_builder(void)
   id_escape_html = rb_intern("escape_html");
   id_gsub = rb_intern("gsub");
   id_to_s = rb_intern("to_s");
+
+  id_id = rb_intern("ID");
+  id_class = rb_intern("CLASS");
+  id_underscore = rb_intern("UNDERSCORE");
+  id_hyphen = rb_intern("HYPHEN");
+  id_space = rb_intern("SPACE");
+  id_equal = rb_intern("=");
+
+  rb_const_set(rb_mAttributeBuilder, id_id, rb_obj_freeze(rb_str_new_cstr("id")));
+  rb_const_set(rb_mAttributeBuilder, id_class, rb_obj_freeze(rb_str_new_cstr("class")));
+  rb_const_set(rb_mAttributeBuilder, id_underscore, rb_obj_freeze(rb_str_new_cstr("_")));
+  rb_const_set(rb_mAttributeBuilder, id_hyphen, rb_obj_freeze(rb_str_new_cstr("-")));
+  rb_const_set(rb_mAttributeBuilder, id_space, rb_obj_freeze(rb_str_new_cstr(" ")));
+  rb_const_set(rb_mAttributeBuilder, id_equal, rb_obj_freeze(rb_str_new_cstr("=")));
+
   rb_require("temple");
 }

data/lib/faml/compiler.rb

@@ -1,10 +1,11 @@
-require 'parser/current'
+require 'ripper'
 require 'temple'
 require 'haml_parser/ast'
 require 'faml/error'
 require 'faml/filter_compilers'
 require 'faml/helpers'
 require 'faml/rails_helpers'
+require 'faml/ruby_syntax_checker'
 require 'faml/static_hash_parser'
 require 'faml/text_compiler'
 
@@ -295,13 +296,9 @@ module Faml
     end
 
     def assert_valid_ruby_code!(text)
-      parser = ::Parser::CurrentRuby.new
-      parser.diagnostics.consumer = nil
-      buffer = ::Parser::Source::Buffer.new('(faml)')
-      buffer.source = "call(#{text})"
-      parser.parse(buffer)
+      RubySyntaxChecker.new("call(#{text})", '(faml)').parse
       true
-    rescue ::Parser::SyntaxError
+    rescue RubySyntaxChecker::Error
       raise UnparsableRubyCode.new("Unparsable Ruby code is given to attributes: #{text}", nil)
     end
 

data/lib/faml/ruby_syntax_checker.rb

@@ -0,0 +1,14 @@
+require 'ripper'
+
+module Faml
+  class RubySyntaxChecker < Ripper
+    class Error < StandardError
+    end
+
+    private
+
+    def on_parse_error(*)
+      raise Error
+    end
+  end
+end

data/lib/faml/version.rb

@@ -1,3 +1,3 @@
 module Faml
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faml
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-13 00:00:00.000000000 Z
+date: 2015-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -357,6 +357,7 @@ files:
 - lib/faml/rails_handler.rb
 - lib/faml/rails_helpers.rb
 - lib/faml/railtie.rb
+- lib/faml/ruby_syntax_checker.rb
 - lib/faml/static_hash_parser.rb
 - lib/faml/text_compiler.rb
 - lib/faml/tilt.rb