hamlit 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ac03a589d9cd0fe2450153fb7ec2f1b1b7ae4c8
-  data.tar.gz: f959a39fcf2966db4858b8beedd51b577e17ba08
+  metadata.gz: 5197e691717bb214cdad95076a339e333b5dd792
+  data.tar.gz: 9c7c54d9caa52e82fc0b530a2e56a4ced80279f8
 SHA512:
-  metadata.gz: f501dcaf6d1b0a3f3fdb49f748b99694e5de11e71c776b4f49505e20e84b3c5226cbe2400565db2531671559a8a6dbd6033a453da7608e1740b3f35558f6e71d
-  data.tar.gz: 08bfee10675d5192d0b0e3aabdaf6ded3db138cb02c037f2b17a7bd94e45dc95a0cf4a95865849a16ab2c68c490df67bca989fd3b0c6484356a5a54ad66ebd57
+  metadata.gz: da4d38596e82c4810fbdf9d89c5e4ea1e41f296b14bc515eba50e1ae23f3393ea9621750c89cad01a5b0e98afe26797b3aba14a1ea5136a1e34f79312a8e34b2
+  data.tar.gz: 32c52ed264090db9a982b64f552e691c75fb74d28a7d4e542c98348e04fd639c86014aad59c8d70a9a98f0621abb94ecd4503b31a3524cf14cc59a89f4c5642e

data/lib/hamlit/attribute.rb

@@ -22,6 +22,11 @@ module Hamlit
     def build(attributes)
       result = ''
       flatten_attributes(attributes).each do |key, value|
+        if value == true
+          result += " #{key}"
+          next
+        end
+
         escaped = Temple::Utils.escape_html(value)
         result += " #{key}=#{@quote}#{escaped}#{@quote}"
       end

data/lib/hamlit/compilers/old_attribute.rb

@@ -6,22 +6,32 @@ require 'hamlit/concerns/ripperable'
 # This module compiles only old-style attribute, which is
 # surrounded by brackets.
 module Hamlit
+  # This error is raised when hamlit copmiler decide to
+  # copmile the attributes on runtime.
+  class RuntimeBuild < StandardError; end
+
   module Compilers
     module OldAttribute
       include Concerns::AttributeBuilder
       include Concerns::Balanceable
       include Concerns::Ripperable
 
+      # For performance, only data can be nested.
+      NESTABLE_ATTRIBUTES = %w[data].freeze
       IGNORED_EXPRESSIONS = %w[false nil].freeze
 
       def compile_old_attribute(str)
-        return runtime_build(str) unless Ripper.sexp(str)
+        raise RuntimeBuild unless Ripper.sexp(str)
 
         attrs = parse_old_attributes(str)
         format_attributes(attrs).map do |key, value|
           next true_attribute(key) if value == 'true'
+          assert_static_value!(value) if NESTABLE_ATTRIBUTES.include?(key)
+
           [:html, :attr, key, [:dynamic, value]]
         end
+      rescue RuntimeBuild
+        return runtime_build(str)
       end
 
       private
@@ -38,6 +48,14 @@ module Hamlit
         end
       end
 
+      # Give up static copmile when variables are detected.
+      def assert_static_value!(value)
+        tokens = Ripper.lex(value)
+        tokens.each do |(row, col), type, str|
+          raise RuntimeBuild if type == :on_ident
+        end
+      end
+
       # Parse brace-balanced string and return the result as hash
       def parse_old_attributes(str)
         attributes = {}

data/lib/hamlit/concerns/error.rb

@@ -11,7 +11,7 @@ module Hamlit
         [:code, code]
       end
 
-      def assert!(message)
+      def copmile_error!(message)
         raise CompileError.new(message)
       end
 

data/lib/hamlit/concerns/indentable.rb

@@ -34,7 +34,7 @@ module Hamlit
         width = count_width(line)
 
         return (width + 1) / 2 unless strict
-        assert!('Expected to count even-width indent') if width.odd?
+        compile_error!('Expected to count even-width indent') if width.odd?
 
         width / 2
       end

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/hamlit/engine/old_attributes_spec.rb

@@ -48,6 +48,15 @@ describe Hamlit::Engine do
       HTML
     end
 
+    it 'renders nested hash whose value is variable' do
+      assert_render(<<-'HAML', <<-HTML)
+        - hash = { disable: true }
+        %span{ data: hash } bar
+      HAML
+        <span data-disable>bar</span>
+      HTML
+    end
+
     it 'renders false or nil attributes' do
       assert_render(<<-'HAML', <<-HTML)
         - hash = { checked: false }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Takashi Kokubun