hamlit 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a6fd40edd6056710c6fb7a7e571f287355eb797
-  data.tar.gz: afbad9c5994019cf52bfd0e304a07cfe8f6ec218
+  metadata.gz: 3045e96b4ecfe58f815e7d1fd326c1794b03c66f
+  data.tar.gz: e5c45da5f9a6a2ccfab6e102c47f1d9927098d65
 SHA512:
-  metadata.gz: b71d35469d13442cfdf812ff0fca240f592e825c5b73f30fca91b064b4332b49eff366de7fa55055f7cad58b8e0d91a5790827eba7d76bea06fd66413be597d8
-  data.tar.gz: 56b2b3b77f0a8a8eade006c176196952934ffff5f7a29d8ea15547ab448879299b5c1b63d31d0875290e160370744c187885467f5c0a88cf04128b6d2f78f0b4
+  metadata.gz: 1d80b09e16c7707191fede2b060cc6c7a3f1db422ddaad0be03f3e8cbaa9b395ac04f74f4d396a781de11616bad672a61221501cac3f2d184c4be9453e6af89c
+  data.tar.gz: 45e2ee5c7d2f955f15e3093f0f1f87db2783e78b4baf9f1cdedcafb84568e4d5f78c85563461f845f254db80524600f6ceede60a8313d2817af3de248ab2ec79

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.4.7
+
+- Sort static old attributes by name
+- Bugfix for old array attributes with class element
+
 ## v1.4.6
 
 - Support `!==`, `==` operator

data/lib/hamlit/attribute.rb

@@ -61,8 +61,8 @@ module Hamlit
           case key
           when :id
             result[key] = [base[key], target[key]].compact.join('_')
-          else
-            result[key] = [base[key], target[key]].compact.map(&:to_s).sort.join(' ')
+          when :class
+            result[key] = [base[key], target[key]].flatten.compact.map(&:to_s).sort.join(' ')
           end
         else
           result[key] = base[key].nil? ? target[key] : base[key]

data/lib/hamlit/compilers/attributes.rb

@@ -22,7 +22,7 @@ module Hamlit
         attrs = compile_attributes(attrs)
         attrs = join_ids(attrs)
         attrs = combine_classes(attrs)
-        attrs = pull_class_first(attrs)
+        attrs = sort_attributes(attrs)
 
         if has_runtime_attribute?(attrs) && has_attr?(attrs, 'class', 'id')
           attrs = merge_runtime_attributes(attrs)
@@ -60,11 +60,6 @@ module Hamlit
         attrs
       end
 
-      def pull_class_first(attrs)
-        class_attrs = filter_attrs(attrs, 'class')
-        combine_classes(class_attrs) + (attrs - class_attrs)
-      end
-
       def combine_classes(attrs)
         class_attrs = filter_attrs(attrs, 'class')
         return attrs if class_attrs.length <= 1
@@ -99,6 +94,15 @@ module Hamlit
         end
         result
       end
+
+      # Sort attributes by attribute name.
+      # Move runtime attributes to last.
+      def sort_attributes(attrs)
+        attrs.sort_by do |(sexp, _, attr_name, _)|
+          next '' if sexp == :runtime
+          attr_name
+        end
+      end
     end
   end
 end

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "1.4.6"
+  VERSION = "1.4.7"
 end

data/spec/hamlit/engine/old_attributes_spec.rb

@@ -64,6 +64,16 @@ describe Hamlit::Engine do
       HTML
     end
 
+    it 'sorts static attributes by name' do
+      assert_render(<<-HAML, <<-HTML)
+        %span{ :foo => "bar", :hoge => "piyo"}
+        %span{ :hoge => "piyo", :foo => "bar"}
+      HAML
+        <span foo='bar' hoge='piyo'></span>
+        <span foo='bar' hoge='piyo'></span>
+      HTML
+    end
+
     describe 'runtime attributes' do
       it 'renders runtime hash attribute' do
         assert_render(<<-'HAML', <<-HTML)
@@ -111,6 +121,18 @@ describe Hamlit::Engine do
         HTML
       end
 
+      it 'joins attribute class and element class' do
+        assert_render(<<-HAML, <<-HTML)
+          .foo{ class: ['bar'] }
+          .foo{ class: ['bar', nil] }
+          .foo{ class: ['bar', 'baz'] }
+        HAML
+          <div class='bar foo'></div>
+          <div class='bar foo'></div>
+          <div class='bar baz foo'></div>
+        HTML
+      end
+
       it 'joins id with an underscore' do
         assert_render(<<-'HAML', <<-HTML)
           - val = ['a', 'b', 'c']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils