opulent 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbda9fcfae11aa802dd630503537fe4ad6e68208
-  data.tar.gz: 7d9f569b65d0a043c6fdb831992eb17860cd9d01
+  metadata.gz: b6daf567113902547514da9b31c194ca45587239
+  data.tar.gz: 21ed11e388a2cdf395adadc22b22599ff034c30d
 SHA512:
-  metadata.gz: 48323906c8fd7463558c599b7bdb2aa3d4799b6544fb51d5ad284903d11869bd00f24b96ade47edaf90a34c13fe0b36dedd8b8a43ca855ee5d65586ba76bd242
-  data.tar.gz: 10cee6d1c1153a20d15acbcf591a7404722ee7dde668d40d7d0cb118719b8360f1061bc013411cf345c5fabfafc7fe2131714a39e88a3059959e2a15c3046e8c
+  metadata.gz: aa4b1110a6588609be2b67b1cbeffd7331cade6abcacac05935fbddf5aa7996fed7b115f5da47b3c7e501e2a05b31f303445ac0e9b401f996a033ee914a26775
+  data.tar.gz: 57a2e9efab145024e4b7ff18109d2a244e15ab3677b679ed4937e68caa2db9b66effc68faed0e667e4c7d8e564a5989aef10cb8c1f9600751f56bc918c5e5325

data/lib/opulent/compiler/define.rb

@@ -32,7 +32,9 @@ module Opulent
       # by generating the required attribute code
       attributes = {}
       call_node[@options][:attributes].each do |key, attribute|
-        attributes[key] = map_attribute key, attribute, context
+        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
@@ -43,10 +45,14 @@ module Opulent
 
       # Extract values which appear as definition parameters. If we have the
       # key passed as argument, get its value. Otherwise, set the default
-      # parameter value
+      # 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 attributes[key]
-          arguments[key] = attributes.delete key
+        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

data/lib/opulent/parser/root.rb

@@ -38,6 +38,7 @@ module Opulent
                         block_yield(parent, indent) ||
                         block(parent, indent)       ||
                         require_file(parent, indent)||
+                        html_text(parent, indent)   ||
                         doctype(parent, indent)
 
         # Throw an error if we couldn't find a valid node

data/lib/opulent/parser/text.rb

@@ -56,9 +56,9 @@ module Opulent
     # Match one line or multiline, escaped or unescaped text
     #
     def html_text(parent, indent)
-      if (text_feed = accept_stripped :html_text)
+      if (text_feed = accept :html_text)
         text_node = [:plain, :text, {value: text_feed.strip, escaped: false}, nil, indent]
-
+        
         parent[@children] << text_node
       end
     end

data/lib/opulent/tokens.rb

@@ -8,7 +8,7 @@ module Opulent
     #
     @@tokens = {
       # Indentation
-      indent: /\A */,
+      indent: /\A\s*/,
 
       # Node
       node: /\A\w+(\-\w+)*/,
@@ -65,7 +65,7 @@ module Opulent
       multiline: /\A(\|)/,
 
       # HTML Text
-      html_text: /\A(\<.+\>.*)/,
+      html_text: /\A\<.+\>.*/,
 
       # Yield
       yield: /\A(yield)/,
@@ -125,7 +125,7 @@ module Opulent
       hash_symbol: /\A([a-zA-Z\_][a-zA-Z0-9\_]*\:(?!\:))/,
 
       # Whitespace
-      whitespace: /\A +/,
+      whitespace: /\A\s+/,
 
       # Evaluation
       eval: /\A\-(.*)/,

data/lib/opulent/version.rb

@@ -1,4 +1,4 @@
 # @Opulent
 module Opulent
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opulent
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Alex Grozav
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler