faml 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7a063fee1f2806cfe4b482c790ec377b5870653
-  data.tar.gz: 60fe5ca8e1aa9a9c3b5dc2d6fd5e52583f49ab11
+  metadata.gz: 13af244db12ca1e99e25c6f757a58390e966b37e
+  data.tar.gz: 9528efe51e42a8d73fa0eee94e831509b4f46912
 SHA512:
-  metadata.gz: 1eb70dba3088438ee8139cdfdcda59b572c4bc2fa6ea9f858d4b621bebfe6e909e0ac24bd2623d1932a5d70a95699cd073f9e7eedf1fc663dcf5d232f4f7736d
-  data.tar.gz: dc3cffec0d339450dc104958de8e3aed251660f1d1b0e75cb76af6214325a4e70ed334783c9606f563ee1e0f2a50cef05e7ab80c984cc30b31bf2e7f7370a00b
+  metadata.gz: da4116520b13a085b7cebeb5ecc3a6a36787461db58fe5eb37cec1a3554de3a171494719e494eb64b9267e24fa765fa62311bbeceebb721d0ea745700d9e037f
+  data.tar.gz: bf0d92f3dde0f11aba126fa2f592429e149de0445f82a662589df132b462bea2b75adb959143fb82759c5258165e8f8f13009efc02e2a15774ac6c5bd12cb9d1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.13 (2015-04-14)
+- Fix attribute rendering in non-html format when the value is true
+- Fix Faml::Engine constructor to allow user to set options via `Faml::Engine.options`
+
 ## 0.2.12 (2015-04-12)
 - Remove duplicated class values
     - For compatibility

data/README.md

@@ -23,6 +23,16 @@ Or install it yourself as:
     $ gem install faml
 
 ## Usage
+You can set several options via `Faml::Engine.options` .
+
+```ruby
+# Render in XHTML format
+Faml::Engine.options[:format] = :xhtml
+# Disable autoclose
+Faml::Engine.options[:autoclose] = []
+# Disable auto preserve
+Faml::Engine.options[:preserve] = []
+```
 
 ### Rails, sinatra
 Just replace your `gem 'haml'` with `gem 'faml'` .

data/benchmark/compiling.rb

@@ -17,7 +17,7 @@ slim_code = ARGV[1] ? File.read(ARGV[1]) : nil
 Benchmark.ips do |x|
   x.report('Haml') { Haml::Engine.new(haml_code, ugly: true, escape_html: true) }
   x.report('Faml') { Faml::Engine.new.call(haml_code) }
-  x.report('Hamlit') { Hamlit::Engine.new(escape_html: true).call(haml_code) }
+  x.report('Hamlit') { Hamlit::Engine.new.call(haml_code) }
   if slim_code
     x.report('Slim') { Slim::Engine.new.call(slim_code) }
   end

data/benchmark/rendering.rb

@@ -21,8 +21,8 @@ Benchmark.ips do |x|
   obj.instance_eval %{
     def faml_array; #{Faml::Engine.new.call(haml_code)}; end
     def faml_string; #{Faml::Engine.new(generator: Temple::Generators::RailsOutputBuffer).call(haml_code)}; end
-    def hamlit_array; #{Hamlit::Engine.new(escape_html: true).call(haml_code)}; end
-    def hamlit_string; #{Hamlit::Engine.new(escape_html: true, generator: Temple::Generators::RailsOutputBuffer).call(haml_code)}; end
+    def hamlit_array; #{Hamlit::Engine.new.call(haml_code)}; end
+    def hamlit_string; #{Hamlit::Engine.new(generator: Temple::Generators::RailsOutputBuffer).call(haml_code)}; end
   }
   if slim_code
     obj.instance_eval %{

data/benchmark/slim.rb

@@ -15,7 +15,7 @@ context = Context.new
 Haml::Engine.new(haml_code, ugly: true, escape_html: true).def_method(context, :haml)
 context.instance_eval %{
   def faml; #{Faml::Engine.new(generator: Temple::Generators::RailsOutputBuffer).call(haml_code)}; end
-  def hamlit; #{Hamlit::Engine.new(escape_html: true, generator: Temple::Generators::RailsOutputBuffer).call(haml_code)}; end
+  def hamlit; #{Hamlit::Engine.new(generator: Temple::Generators::RailsOutputBuffer).call(haml_code)}; end
   def slim; #{Slim::Engine.new(generator: Temple::Generators::RailsOutputBuffer).call(slim_code)}; end
 }
 

data/ext/attribute_builder/attribute_builder.c

@@ -161,7 +161,7 @@ put_attribute(VALUE attr_quote, VALUE key, VALUE value)
 }
 
 static VALUE
-build_attribute(VALUE attr_quote, VALUE key, VALUE value)
+build_attribute(VALUE attr_quote, int is_html, VALUE key, VALUE value)
 {
   const char *key_cstr = StringValueCStr(key);
   if (strcmp(key_cstr, "class") == 0) {
@@ -199,10 +199,14 @@ build_attribute(VALUE attr_quote, VALUE key, VALUE value)
       return put_attribute(attr_quote, key, rb_ary_join(ary, rb_str_new_cstr("_")));
     }
   } else if (RB_TYPE_P(value, T_TRUE)) {
-    VALUE attr = rb_str_buf_new(1 + RSTRING_LEN(key));
-    rb_str_buf_cat(attr, " ", 1);
-    rb_str_buf_append(attr, key);
-    return attr;
+    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;
+    } else {
+      return put_attribute(attr_quote, key, key);
+    }
   } else if (RB_TYPE_P(value, T_FALSE) || NIL_P(value)) {
     return Qnil;
   } else {
@@ -212,17 +216,19 @@ build_attribute(VALUE attr_quote, VALUE key, VALUE value)
 }
 
 static VALUE
-m_build(int argc, VALUE *argv, VALUE self)
+m_build(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self))
 {
   VALUE attr_quote, attributes, keys, buf;
+  int is_html;
   long len, i;
 
-  rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
+  rb_check_arity(argc, 2, UNLIMITED_ARGUMENTS);
   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());
-  merge(attributes, argc-1, argv+1);
+  merge(attributes, argc-2, argv+2);
 
   keys = rb_funcall(attributes, id_keys, 0);
   rb_funcall(keys, id_sort_bang, 0);
@@ -230,14 +236,14 @@ m_build(int argc, VALUE *argv, VALUE self)
   buf = rb_ary_new_capa(len);
   for (i = 0; i < len; i++) {
     VALUE k = RARRAY_AREF(keys, i);
-    rb_ary_push(buf, build_attribute(attr_quote, k, rb_hash_lookup(attributes, k)));
+    rb_ary_push(buf, build_attribute(attr_quote, is_html, k, rb_hash_lookup(attributes, k)));
   }
 
   return rb_ary_join(buf, Qnil);
 }
 
 static VALUE
-m_normalize_data(VALUE self, VALUE data)
+m_normalize_data(RB_UNUSED_VAR(VALUE self), VALUE data)
 {
   return normalize_data(data);
 }

data/ext/attribute_builder/extconf.rb

@@ -1,3 +1,4 @@
 require 'mkmf'
 
+$CFLAGS << ' -Wall -W'
 create_makefile('faml/attribute_builder')

data/faml.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "coffee-script"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "haml"  # for benchmark
-  spec.add_development_dependency "hamlit"  # for benchmark
+  spec.add_development_dependency "hamlit", ">= 0.6.0"  # for benchmark
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rake-compiler"
   spec.add_development_dependency "redcarpet"

data/lib/faml/engine.rb

@@ -11,15 +11,6 @@ module Faml
       filename: nil,
     )
 
-    DEFAULT_OPTIONS = {
-        format: :html,
-        attr_quote: "'",
-    }.freeze
-
-    def initialize(opts = {})
-      super(DEFAULT_OPTIONS.merge(opts))
-    end
-
     use Parser
     use Compiler
     use Html

data/lib/faml/html.rb

@@ -2,6 +2,10 @@ require 'faml/attribute_builder'
 
 module Faml
   class Html < Temple::HTML::Fast
+    # Override temple's default
+    self.options[:format] = :html
+    self.options[:attr_quote] = "'"
+
     def on_haml_tag(name, self_closing, attrs, content = nil)
       name = name.to_s
       closed = self_closing && (!content || empty_exp?(content))
@@ -13,22 +17,18 @@ module Faml
     end
 
     def on_haml_attrs(code)
-      [:dynamic, "::Faml::AttributeBuilder.build(#{options[:attr_quote].inspect}, #{code})"]
+      [:dynamic, "::Faml::AttributeBuilder.build(#{options[:attr_quote].inspect}, #{options[:format] == :html}, #{code})"]
     end
 
     def on_haml_attr(name, value)
       if empty_exp?(value)
-        if @format == :html
-          [:static, " #{name}"]
-        else
-          [:static, " #{name}=#{options[:attr_quote]}#{name}#{options[:attr_quote]}"]
-        end
+        true_attribute(name)
       elsif value[0] == :dvalue
         sym = unique_name
         [:multi,
           [:code, "#{sym} = (#{value[1]})"],
           [:case, sym,
-            ['true', [:static, " #{name}"]],
+            ['true', true_attribute(name)],
             ['false, nil', [:multi]],
             [:else, [:multi,
               [:static, " #{name}=#{options[:attr_quote]}"],
@@ -54,5 +54,15 @@ module Faml
     def on_haml_preserve(sym)
       [:dynamic, "::Faml::Compiler.find_and_preserve(#{sym}.to_s)"]
     end
+
+    private
+
+    def true_attribute(name)
+      if @format == :html
+        [:static, " #{name}"]
+      else
+        [:static, " #{name}=#{options[:attr_quote]}#{name}#{options[:attr_quote]}"]
+      end
+    end
   end
 end

data/lib/faml/version.rb

@@ -1,3 +1,3 @@
 module Faml
-  VERSION = "0.2.12"
+  VERSION = "0.2.13"
 end

data/spec/render/attribute_spec.rb

@@ -91,6 +91,8 @@ HAML
   context 'with xhtml format' do
     it 'renders name="name" if value is true' do
       expect(render_string(%q|%span{foo: true, bar: 1} hello|, format: :xhtml)).to eq(%Q{<span bar='1' foo='foo'>hello</span>\n})
+      expect(render_string(%Q|- foo = true\n%span{foo: foo, bar: 1} hello|, format: :xhtml)).to eq(%Q{<span bar='1' foo='foo'>hello</span>\n})
+      expect(render_string(%Q|- h = {foo: true, bar: 1}\n%span{h} hello|, format: :xhtml)).to eq(%Q{<span bar='1' foo='foo'>hello</span>\n})
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faml
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-12 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement