faml 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4090ae5210da7fc60d6ed8e2837ab25f846a8271
-  data.tar.gz: 60d7ddcb1e8fd8f87fc97de7341e97e5e3e6c81a
+  metadata.gz: a7a063fee1f2806cfe4b482c790ec377b5870653
+  data.tar.gz: 60fe5ca8e1aa9a9c3b5dc2d6fd5e52583f49ab11
 SHA512:
-  metadata.gz: 3840b30af5a7e5edcf48918d91046fcd34b2982672770a5b29afca3f05833676f30dbed78fe00e5807fbe3b8ffa58fd6a2e737509e307ee544c6769cf63c93bc
-  data.tar.gz: 1afc3e04ae4fb23a20b9e0fb316bf5cf336c162df281165c726f2f240e494639dadc8e197d70e41bb44d0a4424de0fe6ed3b7d640f1603c0fe4819cb4448784f
+  metadata.gz: 1eb70dba3088438ee8139cdfdcda59b572c4bc2fa6ea9f858d4b621bebfe6e909e0ac24bd2623d1932a5d70a95699cd073f9e7eedf1fc663dcf5d232f4f7736d
+  data.tar.gz: dc3cffec0d339450dc104958de8e3aed251660f1d1b0e75cb76af6214325a4e70ed334783c9606f563ee1e0f2a50cef05e7ab80c984cc30b31bf2e7f7370a00b

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.12 (2015-04-12)
+- Remove duplicated class values
+    - For compatibility
+- Add `version` subcommand
+- Add `--format` option to cli
+
 ## 0.2.11 (2015-04-07)
 - Keep code newlines within multiline in HTML-style attribute list
     - https://github.com/eagletmt/faml/issues/19

data/ext/attribute_builder/attribute_builder.c

@@ -9,7 +9,7 @@
 #endif
 
 VALUE rb_mAttributeBuilder;
-static ID id_keys, id_sort_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_temple, id_utils, id_escape_html, id_gsub, id_to_s;
 
 static void
 concat_array_attribute(VALUE attributes, VALUE hash, VALUE key)
@@ -179,6 +179,7 @@ build_attribute(VALUE attr_quote, VALUE key, VALUE value)
         rb_ary_push(ary, rb_funcall(v, id_to_s, 0));
       }
       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(" ")));
     }
   } else if (strcmp(key_cstr, "id") == 0) {
@@ -251,6 +252,7 @@ Init_attribute_builder(void)
 
   id_keys = rb_intern("keys");
   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");

data/lib/faml/cli.rb

@@ -3,15 +3,19 @@ require 'thor'
 
 module Faml
   class CLI < Thor
+    package_name 'faml'
+
     desc 'render FILE', 'Render haml template'
+    option :format, type: :string, default: :html, desc: 'HTML format'
     def render(file)
-      code = compile_file(file)
+      code = compile_file(file, format: options[:format].to_sym)
       puts instance_eval(code, file)
     end
 
     desc 'compile FILE', 'Compile haml template'
+    option :format, type: :string, default: :html, desc: 'HTML format'
     def compile(file)
-      puts compile_file(file)
+      puts compile_file(file, format: options[:format].to_sym)
     end
 
     desc 'parse FILE', 'Render faml AST'
@@ -21,15 +25,26 @@ module Faml
     end
 
     desc 'temple FILE', 'Render temple AST'
+    option :format, type: :string, default: :html, desc: 'HTML format'
     def temple(file)
       require 'pp'
-      pp Faml::Compiler.new(filename: file).call(parse_file(file))
+      pp Faml::Compiler.new(filename: file, format: options[:format].to_sym).call(parse_file(file))
+    end
+
+    desc 'version', 'Print version'
+    option :numeric, type: :boolean, default: false, desc: 'Print version number only'
+    def version
+      if options[:numeric]
+        puts VERSION
+      else
+        puts "faml #{VERSION}"
+      end
     end
 
     private
 
-    def compile_file(file)
-      Faml::Engine.new(filename: file).call(File.read(file))
+    def compile_file(file, opts)
+      Faml::Engine.new(opts.merge(filename: file)).call(File.read(file))
     end
 
     def parse_file(file)

data/lib/faml/compiler.rb

@@ -321,7 +321,8 @@ module Faml
         static_attributes[k.to_s] = v
       end
       unless static_class.empty?
-        static_attributes['class'] = [static_class.split(/ +/), static_attributes['class']].compact.flatten.map(&:to_s).sort.join(' ')
+        class_list = static_attributes.fetch('class', '').to_s.split(/ +/)
+        static_attributes['class'] = static_class.split(/ +/).concat(class_list).uniq.sort.join(' ')
       end
       unless static_id.empty?
         static_attributes['id'] = [static_id, static_attributes['id']].compact.join('_')

data/lib/faml/version.rb

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

data/spec/render/attribute_spec.rb

@@ -62,6 +62,12 @@ HAML
     expect(render_string('%span.foo{class: 1} hello')).to eq("<span class='1 foo'>hello</span>\n")
   end
 
+  it 'remove duplicated classes' do
+    expect(render_string('%span.foo{class: :foo}')).to eq("<span class='foo'></span>\n")
+    expect(render_string('%span.foo{class: "foo bar"}')).to eq("<span class='bar foo'></span>\n")
+    expect(render_string('%span.foo{class: %w[foo bar]}')).to eq("<span class='bar foo'></span>\n")
+  end
+
   it 'strigify non-string ids' do
     expect(render_string('%span.#foo{id: :bar} hello')).to eq("<span id='foo_bar'>hello</span>\n")
   end

metadata

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