faml 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0b565977825d5840091b528c95126d1145470ff
-  data.tar.gz: 6d7bbd18e0915cdf9a9feb241c40009b85eacddb
+  metadata.gz: 11898f802ec5a7c2db4ee3dddda380478dc5cbff
+  data.tar.gz: 4151d81c63cc375de89f7eb5f165cb63fa9388a3
 SHA512:
-  metadata.gz: ea2a871d173b410deccaa0d693f3a6c6aff6479a78e74c1424147a33ff64277eaf4652e921567bf75bc56f58b61148fe14d1f2149bfe62367f1eb9f023bf428a
-  data.tar.gz: fb9112e98d3df4146c058f2075498de3645ef480e1ebb5af2655775e3459d4f79b8291b2a2b82e12e758922b077063f14d63758cdd58bfc605a01242e819a8c4
+  metadata.gz: d8917747df51adc7d2df2606657e659760eecab5ea673d1241c9acaa024edb6c88884d1e8560093b1faca4a3c5fec77fe345c5b6c3fbfbf713e98e9f7221c4ed
+  data.tar.gz: 3b667d9450d939a47690b906c3b25f1be9708914c07435f5485305374729a2a33ff9c366a1a278ed63fc710c846785d77900f42ab3416b081030a9442481d87f

data/.gitmodules

@@ -1,3 +1,6 @@
 [submodule "haml-spec"]
 	path = haml-spec
 	url = https://github.com/haml/haml-spec
+[submodule "vendor/houdini"]
+	path = vendor/houdini
+	url = https://github.com/vmg/houdini

data/.travis.yml

@@ -19,9 +19,6 @@ matrix:
   allow_failures:
     - rvm: ruby-head
     - gemfile: gemfiles/rails_edge.gemfile
-    # https://github.com/rspec/rspec-rails/pull/1264
-    - rvm: 2.2
-      gemfile: gemfiles/rails_4.0.gemfile
   exclude:
     # Rails 5 requires to run on Ruby 2.2.0 or newer.
     - rvm: 2.0.0

data/Appraisals

@@ -1,25 +1,26 @@
 appraise 'rails-4.0' do
   gem 'rails', '~> 4.0.0'
-  gem 'rspec-rails'
+  gem 'rspec-rails', '>= 3.2.0'
   gem 'sqlite3'
 end
 
 appraise 'rails-4.1' do
   gem 'rails', '~> 4.1.0'
-  gem 'rspec-rails'
+  gem 'rspec-rails', '>= 3.2.0'
   gem 'sqlite3'
 end
 
 appraise 'rails-4.2' do
   gem 'rails', '~> 4.2.0'
-  gem 'rspec-rails'
+  gem 'rspec-rails', '>= 3.2.0'
   gem 'sqlite3'
 end
 
 appraise 'rails-edge' do
   gem 'rails', git: 'https://github.com/rails/rails'
   gem 'arel', git: 'https://github.com/rails/arel'
-  gem 'rspec-rails'
+  gem 'rack', git: 'https://github.com/rack/rack'
+  gem 'rspec-rails', '>= 3.2.0'
   gem 'sqlite3'
 end
 

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.3.2 (2015-09-24)
+- Fix illegal constant name
+- Use `require_relative` if possible
+    - It improves loading performance a little especially when there's long
+      `$LOAD_PATH` by Bundler.
+- Improve `Faml::AttributeBuilder.build` performance
+    - Call `escape_html` C-API (vmg/houdini) directly.
+    - Avoid `String#gsub` for performance
+- Allow NUL characters in attribute keys
+    - You should not include NUL characters, of course.
+
 ## 0.3.1 (2015-09-20)
 - Improve `Faml::AttributeBuilder.build` performance
     - Reduce String allocations

data/Gemfile

@@ -4,5 +4,5 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rails'
-gem 'rspec-rails'
+gem 'rspec-rails', '>= 3.2.0'
 gem 'sqlite3'

data/ext/attribute_builder/attribute_builder.c

@@ -1,5 +1,7 @@
 #include <ruby.h>
+#include <ruby/encoding.h>
 #include <ruby/version.h>
+#include "houdini.h"
 
 #if (RUBY_API_VERSION_MAJOR > 2) || (RUBY_API_VERSION_MAJOR == 2 && RUBY_API_VERSION_MINOR >= 1)
 /* define nothing */
@@ -9,7 +11,7 @@
 #endif
 
 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_keys, id_sort_bang, id_uniq_bang, id_merge_bang, id_to_s;
 static ID id_id, id_class, id_underscore, id_hyphen, id_space, id_equal;
 
 static void
@@ -49,13 +51,39 @@ struct normalize_data_i2_arg {
   VALUE key, normalized;
 };
 
+static VALUE
+substitute_underscores(VALUE str)
+{
+  int frozen;
+  long i, len;
+
+  /* gsub('_', '-') */
+  Check_Type(str, T_STRING);
+  len = RSTRING_LEN(str);
+  frozen = OBJ_FROZEN(str);
+  for (i = 0; i < len; i++) {
+    if (RSTRING_PTR(str)[i] == '_') {
+      if (frozen) {
+        str = rb_str_dup(str);
+        frozen = 0;
+      }
+      rb_str_update(str, i, 1, rb_const_get(rb_mAttributeBuilder, id_hyphen));
+    }
+  }
+
+  return str;
+}
+
 static int
 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_const_get(rb_mAttributeBuilder, id_underscore), rb_const_get(rb_mAttributeBuilder, id_hyphen));
+  k = substitute_underscores(k);
+  if (OBJ_FROZEN(k)) {
+    k = rb_str_dup(k);
+  }
   rb_str_cat(k, "-", 1);
   rb_str_append(k, key);
   rb_hash_aset(arg->normalized, k, value);
@@ -74,7 +102,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_const_get(rb_mAttributeBuilder, id_underscore), rb_const_get(rb_mAttributeBuilder, id_hyphen));
+    key = substitute_underscores(key);
     rb_hash_aset(normalized, key, value);
   }
   return ST_CONTINUE;
@@ -91,6 +119,16 @@ normalize_data(VALUE data)
   return normalized;
 }
 
+static int
+put_data_attribute(VALUE key, VALUE val, VALUE hash)
+{
+  VALUE k = rb_str_buf_new(5 + RSTRING_LEN(key));
+  rb_str_buf_cat(k, "data-", 5);
+  rb_str_buf_append(k, key);
+  rb_hash_aset(hash, k, val);
+  return ST_CONTINUE;
+}
+
 static void
 normalize(VALUE hash)
 {
@@ -99,26 +137,20 @@ normalize(VALUE hash)
   long i;
   for (i = 0; i < len; i++) {
     VALUE key = RARRAY_AREF(keys, i);
-    const char *key_cstr = StringValueCStr(key);
     VALUE value = rb_hash_lookup(hash, key);
-    if (RB_TYPE_P(value, T_HASH) && strcmp(key_cstr, "data") == 0) {
-      VALUE data, data_keys;
-      long data_len, j;
+    VALUE key_str = key;
+
+    if (!RB_TYPE_P(key, T_STRING)) {
+      key_str = rb_funcall(key, id_to_s, 0);
+    }
+    if (RB_TYPE_P(value, T_HASH) && RSTRING_LEN(key_str) == 4 && memcmp(RSTRING_PTR(key_str), "data", 4) == 0) {
+      VALUE data;
 
       rb_hash_delete(hash, key);
       data = normalize_data(value);
-      data_keys = rb_funcall(data, id_keys, 0);
-      rb_funcall(data_keys, id_sort_bang, 0);
-      data_len = RARRAY_LEN(data_keys);
-      for (j = 0; j < data_len; j++) {
-        VALUE data_key = RARRAY_AREF(data_keys, j);
-        VALUE k = rb_str_buf_new(5 + RSTRING_LEN(data_key));
-        rb_str_buf_cat(k, "data-", 5);
-        rb_str_buf_append(k, data_key);
-        rb_hash_aset(hash, k, rb_hash_lookup(data, data_key));
-      }
+      rb_hash_foreach(data, put_data_attribute, hash);
     } else if (!(RB_TYPE_P(value, T_TRUE) || RB_TYPE_P(value, T_FALSE) || NIL_P(value))) {
-      rb_hash_aset(hash, key, rb_funcall(value, id_to_s, 0));
+      rb_hash_aset(hash, key_str, rb_funcall(value, id_to_s, 0));
     }
   }
 }
@@ -143,11 +175,14 @@ merge(VALUE attributes, int argc, VALUE *argv)
 static void
 put_attribute(VALUE buf, VALUE attr_quote, VALUE key, VALUE value)
 {
-  VALUE utils_class;
+  gh_buf ob = GH_BUF_INIT;
 
   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);
+  Check_Type(value, T_STRING);
+  if (houdini_escape_html(&ob, (const uint8_t *)RSTRING_PTR(value), RSTRING_LEN(value))) {
+    value = rb_enc_str_new(ob.ptr, ob.size, rb_utf8_encoding());
+    gh_buf_free(&ob);
+  }
 
   rb_ary_push(buf, rb_const_get(rb_mAttributeBuilder, id_space));
   rb_ary_push(buf, key);
@@ -160,8 +195,11 @@ put_attribute(VALUE buf, VALUE attr_quote, 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) {
+  if (!RB_TYPE_P(key, T_STRING)) {
+    key = rb_funcall(key, id_to_s, 0);
+  }
+  Check_Type(key, T_STRING);
+  if (RSTRING_LEN(key) == 5 && memcmp(RSTRING_PTR(key), "class", 5) == 0) {
     long len;
 
     Check_Type(value, T_ARRAY);
@@ -177,7 +215,7 @@ build_attribute(VALUE buf, VALUE attr_quote, int is_html, VALUE key, VALUE value
       rb_funcall(ary, id_uniq_bang, 0);
       put_attribute(buf, attr_quote, key, rb_ary_join(ary, rb_const_get(rb_mAttributeBuilder, id_space)));
     }
-  } else if (strcmp(key_cstr, "id") == 0) {
+  } else if (RSTRING_LEN(key) == 2 && memcmp(RSTRING_PTR(key), "id", 2) == 0) {
     long len = RARRAY_LEN(value);
 
     Check_Type(value, T_ARRAY);
@@ -250,10 +288,6 @@ Init_attribute_builder(void)
   id_sort_bang = rb_intern("sort!");
   id_uniq_bang = rb_intern("uniq!");
   id_merge_bang = rb_intern("merge!");
-  id_temple = rb_intern("Temple");
-  id_utils = rb_intern("Utils");
-  id_escape_html = rb_intern("escape_html");
-  id_gsub = rb_intern("gsub");
   id_to_s = rb_intern("to_s");
 
   id_id = rb_intern("ID");
@@ -261,7 +295,7 @@ Init_attribute_builder(void)
   id_underscore = rb_intern("UNDERSCORE");
   id_hyphen = rb_intern("HYPHEN");
   id_space = rb_intern("SPACE");
-  id_equal = rb_intern("=");
+  id_equal = rb_intern("EQUAL");
 
   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")));
@@ -269,6 +303,4 @@ Init_attribute_builder(void)
   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/ext/attribute_builder/extconf.rb

@@ -1,4 +1,16 @@
 require 'mkmf'
 
 $CFLAGS << ' -Wall -W'
+houdini_dir = File.expand_path('../../vendor/houdini', __dir__)
+$INCFLAGS << " -I#{houdini_dir}"
+
+$srcs = %w[attribute_builder.c]
+%w[
+  buffer.c
+  houdini_html_e.c
+].each do |c|
+  FileUtils.ln_s(File.join(houdini_dir, c), c, force: true)
+  $srcs << c
+end
+
 create_makefile('faml/attribute_builder')

data/faml.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/eagletmt/faml"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = `git ls-files -z`.split("\x0") + `git -C vendor/houdini ls-files -z`.split("\x0").map { |path| "vendor/houdini/#{path}" }
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.extensions    = ['ext/attribute_builder/extconf.rb']
   spec.test_files    = spec.files.grep(%r{^(test|spec|features|incompatibilities)/})

data/gemfiles/rails_4.0.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 4.0.0"
-gem "rspec-rails"
+gem "rspec-rails", ">= 3.2.0"
 gem "sqlite3"
 
 gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 4.1.0"
-gem "rspec-rails"
+gem "rspec-rails", ">= 3.2.0"
 gem "sqlite3"
 
 gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 4.2.0"
-gem "rspec-rails"
+gem "rspec-rails", ">= 3.2.0"
 gem "sqlite3"
 
 gemspec :path => "../"

data/gemfiles/rails_edge.gemfile

@@ -3,8 +3,9 @@
 source "https://rubygems.org"
 
 gem "rails", :git => "https://github.com/rails/rails"
-gem "rspec-rails"
+gem "rspec-rails", ">= 3.2.0"
 gem "sqlite3"
 gem "arel", :git => "https://github.com/rails/arel"
+gem "rack", :git => "https://github.com/rack/rack"
 
 gemspec :path => "../"

data/incompatibilities/README.md

@@ -1,7 +1,7 @@
 # Incompatibilities
 ## Versions
 - Haml 4.0.7
-- Faml 0.3.0
+- Faml 0.3.2
 - Hamlit 1.7.2
 
 ## Table of contents

data/lib/faml.rb

@@ -1,10 +1,10 @@
-require 'faml/engine'
-require 'faml/tilt'
-require 'faml/version'
+require_relative 'faml/engine'
+require_relative 'faml/tilt'
+require_relative 'faml/version'
 
 begin
   gem 'rails'
   require 'rails'
-  require 'faml/railtie'
+  require_relative 'faml/railtie'
 rescue LoadError
 end

data/lib/faml/cli.rb

@@ -1,4 +1,4 @@
-require 'faml'
+require_relative '../faml'
 require 'thor'
 
 module Faml

data/lib/faml/compiler.rb

@@ -1,13 +1,13 @@
 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'
+require_relative 'error'
+require_relative 'filter_compilers'
+require_relative 'helpers'
+require_relative 'rails_helpers'
+require_relative 'ruby_syntax_checker'
+require_relative 'static_hash_parser'
+require_relative 'text_compiler'
 
 module Faml
   class Compiler < Temple::Parser

data/lib/faml/engine.rb

@@ -1,8 +1,8 @@
-require 'temple'
-require 'faml/compiler'
-require 'faml/html'
-require 'faml/newline'
 require 'haml_parser/parser'
+require 'temple'
+require_relative 'compiler'
+require_relative 'html'
+require_relative 'newline'
 
 module Faml
   class Engine < Temple::Engine

data/lib/faml/filter_compilers.rb

@@ -1,4 +1,4 @@
-require 'faml/error'
+require_relative 'error'
 
 module Faml
   module FilterCompilers
@@ -28,14 +28,14 @@ module Faml
   end
 end
 
-require 'faml/filter_compilers/cdata'
-require 'faml/filter_compilers/coffee'
-require 'faml/filter_compilers/css'
-require 'faml/filter_compilers/escaped'
-require 'faml/filter_compilers/javascript'
-require 'faml/filter_compilers/markdown'
-require 'faml/filter_compilers/plain'
-require 'faml/filter_compilers/preserve'
-require 'faml/filter_compilers/ruby'
-require 'faml/filter_compilers/sass'
-require 'faml/filter_compilers/scss'
+require_relative 'filter_compilers/cdata'
+require_relative 'filter_compilers/coffee'
+require_relative 'filter_compilers/css'
+require_relative 'filter_compilers/escaped'
+require_relative 'filter_compilers/javascript'
+require_relative 'filter_compilers/markdown'
+require_relative 'filter_compilers/plain'
+require_relative 'filter_compilers/preserve'
+require_relative 'filter_compilers/ruby'
+require_relative 'filter_compilers/sass'
+require_relative 'filter_compilers/scss'