opulent 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adcb317d2774dc8ee749c9a36ac819b409812ad4
-  data.tar.gz: 50c443fb0d1df18f2455aff4f52c0ba0f7187cea
+  metadata.gz: 7fbb64044a74d50242806f7da9884dc7fce9301c
+  data.tar.gz: 719f2346be0329264c72385421254681a30e4ac0
 SHA512:
-  metadata.gz: e2ba4bdb98dc6754ade2083b1a812c8577398013ffb7f77265ac09c10a95c6da76fdbc3bb2b1f5f710b514d9c7854379f5aa6809ddea5ebe300ca91b5f0c85b1
-  data.tar.gz: f581c87ad7188a2de2821a5705e3e94481720eaf7d8a6865ddcef8e721b66e6ec92fc52e33792f88635e05cb65d0e11ac9ec6eae5e7ef15fa03e1929ec89d882
+  metadata.gz: 0c9b17d6a8384411a954c1adef1129626475fc6a94e3b2eb65d3ed1caa0c57c5aaaeb5f4aba84d23bff867e47a1d690224d1eddfcdf768a6978f0d1f40e73499
+  data.tar.gz: 6906b5acebccf9a436527ba4644e4bfd5660be16f31dca80020a58438c11e5d6afe083a0ec95281b8269520df77e66a70189690a5f390d96524e01fe9df0bb47

data/benchmark/cases/node/node.haml

@@ -1,7 +1,7 @@
 - a = "hello"
 - kls = ['a', 'b', 'c']
 
-%html hello=a
+%html(hello=a)
   %head
-  %body class=kls
+  %body(class=kls)
     %p Hello world!

data/lib/opulent/compiler/buffer.rb

@@ -63,7 +63,7 @@ module Opulent
     #
     def buffer_attributes_to_hash(attributes)
       "{" + attributes.inject([]) do |extend_map, (key, attribute)|
-        extend_map << ("#{key}: " + if key == :class
+        extend_map << (":\"#{key}\" => " + if key == :class
           '[' + attribute.map do |exp|
             exp[@value]
           end.join(", ") + ']'
@@ -181,8 +181,8 @@ module Opulent
         # When we have an extension for our attributes, check current key.
         # If it exists, check it's type and generate everything dynamically
         if extension
-          buffer_eval "if #{extension}.has_key? :#{key}"
-          variable = buffer_set_variable :local, "#{extension}.delete(:#{key})"
+          buffer_eval "if #{extension}.has_key? :\"#{key}\""
+          variable = buffer_set_variable :local, "#{extension}.delete(:\"#{key}\")"
           buffer_data_attribute_type_check[key, variable, attribute[@options][:escaped]]
           buffer_eval "else"
         end

data/lib/opulent/compiler/define.rb

@@ -18,7 +18,7 @@ module Opulent
 
       # Create the definition
       buffer_eval "instance_eval do"
-      buffer_eval "def #{key}(attributes = {}, &block)" 
+      buffer_eval "def #{key}(attributes = {}, &block)"
 
       # Set each parameter as a local variable
       node[@options][:parameters].each do |parameter, value|
@@ -67,60 +67,6 @@ module Opulent
 
       # End block
       buffer_eval "end"
-
-
-
-      # definition_context.parent = context
-      #
-      # # # Set call node
-      # # call_node = node[@options][:call]
-      # #
-      # # # Get call node attributes
-      # # attributes = call_node[@options][:attributes]
-      # #
-      # # Evaluate node extension in the current context
-      # if call_node[@options][:extension]
-      #   extension = context.evaluate call_node[@options][:extension][@value]
-      # else
-      #   extension = {}
-      # end
-      #
-      # # Evaluate and generate node attributes, then process each one to
-      # # by generating the required attribute code
-      # attributes = {}
-      # call_node[@options][:attributes].each do |key, attribute|
-      #   unless node[@options][:parameters].has_key? key
-      #     attributes[key] = map_attribute key, attribute, context
-      #   end
-      # end
-      #
-      # # Go through each extension attribute and use the value where applicable
-      # extend_attributes attributes, extension
-      #
-      # # Definition call arguments
-      # arguments = {}
-      #
-      # # Extract values which appear as definition parameters. If we have the
-      # # key passed as argument, get its value. Otherwise, set the default
-      # # parameter value.
-      # #
-      # # Definition arguments (parameters which are set in definition header)
-      # # will be passed unescaped, to allow node definition to handle escaping
-      # # properly
-      # node[@options][:parameters].each do |key, value|
-      #   if call_node[@options][:attributes].has_key? key
-      #     arguments[key] = context.evaluate call_node[@options][:attributes][key][@value]
-      #   else
-      #     arguments[key] = definition_context.evaluate value[@value]
-      #   end
-      # end
-      #
-      # # Set the remaining attributes as a value in the arguments
-      # arguments[:attributes] = attributes
-
-
-      # Remove last set of blocks from the block stack
-      @block_stack.pop
     end
   end
 end

data/lib/opulent/utils.rb

@@ -25,7 +25,7 @@ module Opulent
         # @param html [String] The string to escape
         # @return [String] The escaped string
         def escape(html)
-          EscapeUtils.escape_html html.to_s, false
+          EscapeUtils.escape_html html.to_s.chomp, false
         end
       else
         # Returns an escaped copy of `html`.

data/lib/opulent/version.rb

@@ -1,4 +1,4 @@
 # @Opulent
 module Opulent
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opulent
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Alex Grozav