faml 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c75f4eb1e20a0f8b34c9727c3bc6f71dfa968ffe
-  data.tar.gz: a488b7a8c9786cbd0da1c23a2631ab00b3001324
+  metadata.gz: c14024dd27014d4d1b41a1313b1e85f2ba2d4be2
+  data.tar.gz: 1125ce25dca9c6daafe7fc42d04be96057ad9ba6
 SHA512:
-  metadata.gz: 5ffad9305eba0e7af43647e43d79b5ba67074a3657414d0a19ac361b1954b155c022e01d4c26a876eec740a0498c9db0184cc71db90c6d0679fbcc7555793208
-  data.tar.gz: f8a2342f8a888fe2293187ea532b03e0c2bef59fbe58c88acec5f80ae6dcef2c2e996db23b0018c69f3d4114cee8b1a547ff1d796bb62e49a817a8ce2fb11de7
+  metadata.gz: 0b39519a1514a4eb09800291310e7be514a70f8d51ec1eff80f048baafa7fe8237b93ae2cba8ff4ea400a1a0559a89ad4574bd3e12e031684ac34579095982e6
+  data.tar.gz: 2f0f94f8ee613989a4476d0d7165e1712259be33cb679834f1f2eb9a625c384bd26dc49fdb1ec2c713519531d4107a2b8d5dd70d8227264c20463c72c9a108d5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.7.2 (2015-12-13)
+- Improve AttributeBuilder performance
+    - Replace std::ostringstream with std::string
+- Fix compile error in some platforms
+
 ## 0.7.1 (2015-12-04)
 - Fix compiler options for old compilers
 
@@ -18,7 +23,7 @@
     - https://github.com/eagletmt/faml/pull/41
 
 ## 0.6.3 (2015-11-22)
-- Remove duplicated class in Ruby attribute case
+- Remove duplicated class in runtime attribute case
     - `%span.foo{h}` where `h = { class: 'foo bar' }` now renders `<span class='bar foo'></span>` .
     - `%span.foo{class: 'foo bar'}` renders `<span class='bar foo'></span>` since v0.2.12 .
 

data/README.md

@@ -90,7 +90,7 @@ You have to set `Faml::Engine.options[:extend_helpers] = true` to use `preserve`
 ### Others
 If you find other incompatibility, please report it to me :-p.
 
-## Why faml is faster?
+## Why is faml faster?
 ### Temple backend
 I use [temple](https://github.com/judofyr/temple) to achieve faster template rendering.
 It's used by [slim](https://github.com/slim-template/slim) template language & engine which is known as fast.
@@ -120,18 +120,18 @@ The runtime hash merging is implemented by C extension in faml.
 Internally, attributes are categolized into three types.
 
 1. Static attributes
-    - Both the key and the value are literal.
+    - Both the key and the value are static.
     - Compiled into string literals.
     - Fastest.
     - e.g. `%input{checked: false}`
 2. Dynamic attributes
-    - The key is literal but the value isn't.
+    - The key is static but the value isn't.
     - The key is compiled into string literal. The value is interpolated at run-time.
     - Relatively fast.
     - e.g. `%input{checked: helper_method(@record)}`
-3. Ruby attributes
-    - Both the key and the value are non-literal expression.
-    - The attributes are stringified at run-time.
+3. Runtime attributes
+    - Both the key and the value are non-static expression.
+    - The attributes are stringified at runtime.
     - Slow.
     - e.g. `%input{helper_method(@record)}`
 

data/ext/attribute_builder/attribute_builder.cc

@@ -3,7 +3,6 @@
 #include "houdini.h"
 #include <algorithm>
 #include <map>
-#include <sstream>
 #include <string>
 #include <vector>
 
@@ -194,20 +193,20 @@ static void join_class_attribute(attribute_holder& attributes) {
 
   std::sort(ary.begin(), ary.end());
   ary.erase(std::unique(ary.begin(), ary.end()), ary.end());
-  std::ostringstream oss;
+  std::string buf;
   for (std::vector<std::string>::const_iterator it = ary.begin();
        it != ary.end(); ++it) {
     if (it != ary.begin()) {
-      oss << ' ';
+      buf.push_back(' ');
     }
-    oss << *it;
+    buf.append(*it);
   }
-  attributes.upsert("class", attribute_value(oss.str()));
+  attributes.upsert("class", attribute_value(buf));
 }
 
 static void join_id_attribute(attribute_holder& attributes) {
   const std::vector<attribute_value>& ids = attributes.ids_;
-  std::ostringstream oss;
+  std::string buf;
   bool first = true;
 
   for (std::vector<attribute_value>::const_iterator it = ids.begin();
@@ -217,16 +216,16 @@ static void join_id_attribute(attribute_holder& attributes) {
         break;
       case ATTRIBUTE_TYPE_TRUE:
         if (!first) {
-          oss << '_';
+          buf.push_back('_');
         }
-        oss << "true";
+        buf.append("true");
         first = false;
         break;
       case ATTRIBUTE_TYPE_VALUE:
         if (!first) {
-          oss << '_';
+          buf.push_back('_');
         }
-        oss << it->str_;
+        buf.append(it->str_);
         first = false;
         break;
     }
@@ -235,7 +234,7 @@ static void join_id_attribute(attribute_holder& attributes) {
     return;
   }
 
-  attributes.upsert("id", attribute_value(oss.str()));
+  attributes.upsert("id", attribute_value(buf));
 }
 
 static void delete_falsey_values(attributes_type& m) {
@@ -268,34 +267,35 @@ static attributes_type merge(VALUE object_ref, int argc, VALUE* argv) {
   return attributes.m_;
 }
 
-static void put_attribute(std::ostringstream& oss,
+static void put_attribute(std::string& buf,
                           const std::string& attr_quote, const std::string& key,
                           const std::string& value) {
-  oss << " " << key << "=" << attr_quote;
+  buf.append(" ").append(key).append("=").append(attr_quote);
 
   gh_buf ob = GH_BUF_INIT;
   if (houdini_escape_html0(&ob, (const uint8_t*)value.data(), value.size(),
                            0)) {
-    oss << std::string(ob.ptr, ob.size);
+    buf.append(std::string(ob.ptr, ob.size));
     gh_buf_free(&ob);
   } else {
-    oss << value;
+    buf.append(value);
   }
-  oss << attr_quote;
+  buf.append(attr_quote);
 }
 
-static void build_attribute(std::ostringstream& oss,
+static void build_attribute(std::string& buf,
                             const std::string& attr_quote, int is_html,
                             const std::string& key,
                             const attribute_value& value) {
   if (value.type_ == ATTRIBUTE_TYPE_TRUE) {
     if (is_html) {
-      oss << ' ' << key;
+      buf.push_back(' ');
+      buf.append(key);
     } else {
-      put_attribute(oss, attr_quote, key, key);
+      put_attribute(buf, attr_quote, key, key);
     }
   } else {
-    put_attribute(oss, attr_quote, key, value.str_);
+    put_attribute(buf, attr_quote, key, value.str_);
   }
 }
 
@@ -310,14 +310,13 @@ static VALUE m_build(int argc, VALUE* argv, RB_UNUSED_VAR(VALUE self)) {
   object_ref = argv[2];
   const attributes_type attributes = merge(object_ref, argc - 3, argv + 3);
 
-  std::ostringstream oss;
+  std::string buf;
   for (attributes_type::const_iterator it = attributes.begin();
        it != attributes.end(); ++it) {
-    build_attribute(oss, attr_quote, is_html, it->first, it->second);
+    build_attribute(buf, attr_quote, is_html, it->first, it->second);
   }
 
-  const std::string str = oss.str();
-  return rb_utf8_str_new(str.data(), str.size());
+  return rb_utf8_str_new(buf.data(), buf.size());
 }
 
 static VALUE m_normalize_data(RB_UNUSED_VAR(VALUE self), VALUE data) {

data/ext/attribute_builder/extconf.rb

@@ -2,7 +2,7 @@
 require 'mkmf'
 
 $CFLAGS << ' -Wall -W'
-$CXXFLAGS << ' -Wall -W -std=c++98'
+$CXXFLAGS << ' -Wall -W'
 houdini_dir = File.expand_path('../../vendor/houdini', __dir__)
 $INCFLAGS << " -I#{houdini_dir}"
 

data/incompatibilities/README.md

@@ -1,8 +1,8 @@
 # Incompatibilities
 ## Versions
 - Haml 4.1.0.beta.1
-- Faml 0.7.1
-- Hamlit 2.0.1
+- Faml 0.7.2
+- Hamlit 2.0.2
 
 ## Table of contents
 - [spec/compiler_newline_spec.md](spec/compiler_newline_spec.md)

data/lib/faml/stats.rb

@@ -13,7 +13,7 @@ module Faml
       :dynamic_attribute_count,
       :dynamic_attribute_with_data_count,
       :dynamic_attribute_with_newline_count,
-      :ruby_attribute_count,
+      :runtime_attribute_count,
       :object_reference_count,
       :multi_attribute_count,
       :ast_types
@@ -133,7 +133,7 @@ module Faml
           if call_ast.type == :send && call_ast.children[0].nil? && call_ast.children[1] == :call && !call_ast.children[3].nil?
             info.multi_attribute_count += 1
           else
-            info.ruby_attribute_count += 1
+            info.runtime_attribute_count += 1
           end
         end
       end
@@ -142,8 +142,8 @@ module Faml
     def report_attribute_stats(info)
       static = info.static_attribute_count
       dynamic = info.dynamic_attribute_count + info.dynamic_attribute_with_data_count + info.dynamic_attribute_with_newline_count
-      ruby = info.ruby_attribute_count + info.multi_attribute_count + info.object_reference_count
-      total = static + dynamic + ruby
+      runtime = info.runtime_attribute_count + info.multi_attribute_count + info.object_reference_count
+      total = static + dynamic + runtime
       puts 'Attribute stats'
       printf("  Empty attributes: %d\n", info.empty_attribute_count)
       printf("  Attributes with id or class only: %d\n", info.static_id_or_class_attribute_count)
@@ -151,7 +151,7 @@ module Faml
       printf("  Dynamic attributes: %d (%.2f%%)\n", dynamic, dynamic * 100.0 / total)
       printf("    with data: %d\n", info.dynamic_attribute_with_data_count)
       printf("    with newline: %d\n", info.dynamic_attribute_with_newline_count)
-      printf("  Ruby attributes: %d (%.2f%%)\n", ruby, ruby * 100.0 / total)
+      printf("  Runtime attributes: %d (%.2f%%)\n", runtime, runtime * 100.0 / total)
       printf("    with multiple arguments: %d\n", info.multi_attribute_count)
       printf("    with object reference: %d\n", info.object_reference_count)
     end

data/lib/faml/version.rb

@@ -1,4 +1,4 @@
 # frozen-string-literal: true
 module Faml
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

data/spec/compiler_newline_spec.rb

@@ -190,7 +190,7 @@ HAML
 HAML
       end
 
-      it 'keeps newlines in ruby attributes' do
+      it 'keeps newlines in runtime attributes' do
         expect { render_string(<<HAML) }.to raise_error(LineVerifier, raised_at(2))
 %span{[1,
   raise(LineVerifier)]}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faml
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -521,7 +521,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Faster implementation of Haml template language.