sal 0.2.3 → 0.3.0

data/lib/sal/compiler.rb

@@ -12,31 +12,23 @@ module Sal
       [:html, :tag, tag, format_attrs(attrs), compile(content)]
     end
 
-    def on_sal_text(incode, text)
-      if incode
-        [:dynamic, "Sal::U.parse_for_html(_saldict, '#{text}')"]
+    def on_sal_text(text, code = nil)
+      if code
+        [:dynamic, "Sal::U.parse_for_html(_saldict, '#{code}', '#{text}')"]
       else
         [:static, text]
       end
     end
 
     def on_sal_code(code, tag, attrs, content)
-      tmp1, tmp2 = unique_name, unique_name
-      content = compile(content)
+      tmp1 = unique_name
       if code == 'yield'
         [:dynamic, code]
       else
-        [:if, "(#{tmp1} = _saldict['#{code}'])",
-         [:multi,
-          [:code, "#{tmp2}  = _saldict"],
-          [:code, "_saldict = #{tmp1}"],
-          [:case, tmp1,
-           ['Array',
-            [:block, "#{tmp1}.each do |_saldict|",
-             [:html, :tag, tag, ada(attrs), content]]],
-           [:else,
-            [:html, :tag, tag, ada(attrs), content]]],
-          [:code, "_saldict = #{tmp2}"]]]
+        [:multi,
+          [:if, "(#{tmp1} = _saldict['#{code}'])",
+            [:block, "Array(#{tmp1}).each do |_saldict|",
+              [:html, :tag, tag, ada(attrs), compile(content)]]]]
       end
     end
 

data/lib/sal/parser.rb

@@ -26,30 +26,28 @@ module Sal
 
     private
 
-    def parse_nodeset(stacks, nodes, incode = false)
+    def parse_nodeset(stacks, nodes, code = nil)
       nodes.children.each do |node|
         tag = node.name
-
+        @code = code
         case node.type
         when Nokogiri::XML::Node::ELEMENT_NODE
           content = [:multi]
-          attrs, code = parse_attrs(node)
-          if code
-            incode = true
-            stacks.last << [:sal, :code, code, tag, attrs, content]
+          attrs, @code = parse_attrs(node)
+          if @code
+            stacks.last << [:sal, :code, @code, tag, attrs, content]
           else
-            incode = false
             stacks.last << [:sal, :tag, tag, attrs, content]
           end
           stacks << content
-          parse_nodeset(stacks, node, incode)
+          parse_nodeset(stacks, node, @code)
           stacks.pop
         when Nokogiri::XML::Node::TEXT_NODE
           str = node.text
           if str.strip.empty?
             stacks.last << [:newline]
           else
-            stacks.last << [:sal, :text, incode, str]
+            stacks.last << [:sal, :text, str, @code]
           end
         when Nokogiri::XML::Node::DTD_NODE
           stacks.last << [:static, node.to_s]

data/lib/sal/u.rb

@@ -7,8 +7,8 @@ module Sal
         result = result.value if result.kind_of?(Sal::Wrapper)
 
         return unless result.kind_of?(Hash)
-
         result = stringify_keys(result)
+        return unless result['html']
 
         # concat values on class attribute
         if attrs['class'] && result['class']
@@ -18,12 +18,12 @@ module Sal
         " #{result.collect{ |k,v| "#{k}='#{v}'" unless k.to_s == 'html' }.compact.join(' ')}"
       end
 
-      def parse_for_html(result, text = '')
+      def parse_for_html(result, code, text = '')
         result = result.value if result.kind_of?(Sal::Wrapper)
         if result.kind_of?(String)
           result
         elsif result.kind_of?(Hash)
-          result.delete(:html)
+          result[:html] || result[code.to_sym]
         else
           text unless text.strip.empty?
         end

data/lib/sal/version.rb

@@ -1,3 +1,3 @@
 module Sal
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

data/lib/sal/wrapper.rb

@@ -20,11 +20,11 @@ module Sal
     # go through the same steps on the parent object.  This is useful when
     # you are iterating over objects.
     def [](name)
-      return wrap(value.send(name)) if value.respond_to?(name)
       if value.respond_to?(:has_key?)
         return wrap(value[name.to_sym]) if value.has_key?(name.to_sym)
         return wrap(value[name.to_s]) if value.has_key?(name.to_s)
       end
+      return wrap(value.send(name)) if value.respond_to?(name)
       return wrap(value.instance_variable_get("@#{name}")) if value.instance_variable_defined?("@#{name}")
       parent[name] if parent
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sal
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-20 00:00:00.000000000 -04:00
+date: 2011-10-22 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2161648640 !ruby/object:Gem::Requirement
+  requirement: &2164373500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2161648640
+  version_requirements: *2164373500
 - !ruby/object:Gem::Dependency
   name: temple
-  requirement: &2161648120 !ruby/object:Gem::Requirement
+  requirement: &2164372980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2161648120
+  version_requirements: *2164372980
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &2161647640 !ruby/object:Gem::Requirement
+  requirement: &2164372500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2161647640
+  version_requirements: *2164372500
 description: sal.rb is an attribute language.
 email:
 - andy@stonean.com