sal 0.2.1 → 0.2.2

data/lib/sal.rb

@@ -4,7 +4,6 @@ require 'temple'
 require 'sal/u'
 require 'sal/wrapper'
 require 'sal/parser'
-require 'sal/filter'
 require 'sal/compiler'
 require 'sal/engine'
 require 'sal/template'

data/lib/sal/compiler.rb

@@ -1,10 +1,15 @@
 module Sal
   # Compiles HTML into Temple::HTML expressions
   # @api private
-  class Compiler < Filter
+  class Compiler < Temple::Filter
+    def call(exp)
+      [:multi,
+       [:code, "_saldict = Sal::Wrapper.new(self)"],
+       super]
+    end
 
     def on_sal_tag(tag, attrs, content)
-      [:html, :tag, tag, format_attrs(attrs), false, compile(content)]
+      [:html, :tag, tag, format_attrs(attrs), compile(content)]
     end
 
     def on_sal_text(incode, text)
@@ -16,31 +21,25 @@ module Sal
     end
 
     def on_sal_code(code, tag, attrs, content)
-      tmp1, tmp2 = tmp_var(:sal), tmp_var(:sal)
+      tmp1, tmp2 = unique_name, unique_name
       content = compile(content)
-      [:multi,
-        [:block,  "if (#{tmp1} = _saldict['#{code}'])"],
-        [:block,    "#{tmp2}  = _saldict"],
-        [:block,    "_saldict = #{tmp1}"],
-        [:block,    "case (#{tmp1})"],
-        [:block,    "when Array"],
-        [:block,      "#{tmp1}.each do |_saldict|"],
-                        [:html, :tag, tag, ada(attrs), false, content],
-        [:block,      'end'],
-        [:block,    "else"],
-                      [:html, :tag, tag, ada(attrs), false, content],
-        [:block,    'end'],
-        [:block,    "_saldict = #{tmp2}"],
-        [:block,  'end'],
-      ]
+      [: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}"]]]
     end
 
     private
 
     def format_attrs(attrs)
-      a = []
-      attrs.each{ |k,v| a << [k, [:static, v]] }
-      [:multi, [:html, :staticattrs] + a]
+      attrs.inject([:html, :attrs]) {|a, (k,v)| a << [:html, :attr, k, [:static, v]] }
     end
 
     def ada(attrs)

data/lib/sal/engine.rb

@@ -3,10 +3,11 @@ module Sal
     set_default_options   :format => :html,
                           :generator => Temple::Generators::ArrayBuffer
 
-    use Sal::Parser, :file, :tabsize, :encoding
+    use Sal::Parser, :file, :encoding
     use Sal::Compiler
     use Temple::HTML::Fast
 
+    filter :ControlFlow
     filter :MultiFlattener    # Collapse nested multis into single multi
     filter :StaticMerger      # Merge several statics into a single static
     filter :DynamicInliner    # Merge several static/dynamic into single dynamic

data/lib/sal/parser.rb

@@ -4,13 +4,7 @@ module Sal
   class Parser
     include Temple::Mixins::Options
 
-    set_default_options :tabsize => 4,
-                        :encoding => 'utf-8'
-
-    def initialize(options = {})
-      super
-      @tab = ' ' * @options[:tabsize]
-    end
+    set_default_options :encoding => 'utf-8'
 
     # Compile the string to a Temple expression
     #
@@ -25,13 +19,8 @@ module Sal
         str.force_encoding(old_enc) unless str.valid_encoding?
       end
 
-      result = [:multi,
-                [:block, "_saldict = Sal::Wrapper.new(self)"]]
-
-      doc = Nokogiri::XML(str)
-
-      parse_nodeset([result], doc)
-
+      result = [:multi]
+      parse_nodeset([result], Nokogiri::XML(str))
       result
     end
 

data/lib/sal/template.rb

@@ -4,10 +4,10 @@ module Sal
   Template = Temple::Templates::Tilt(Sal::Engine, :register_as => :sal)
 
   if Object.const_defined?(:Rails)
-    RailsTemplate = Temple::Templates::Rails(Sal::Engine, :register_as => :sal)
-
-    RailsTemplate.set_default_options :generator => Temple::Generators::RailsOutputBuffer, 
-                                      :disable_capture => true
+    RailsTemplate = Temple::Templates::Rails(Sal::Engine,
+                                             :register_as => :sal,
+                                             :generator => Temple::Generators::RailsOutputBuffer,
+                                             :disable_capture => true)
   end
 end
 

data/lib/sal/version.rb

@@ -1,3 +1,3 @@
 module Sal
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -2,7 +2,7 @@
 name: sal
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Andrew Stone
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 -04:00
+date: 2011-05-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.2"
+        version: "0.3"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -60,7 +60,6 @@ files:
 - lib/sal.rb
 - lib/sal/compiler.rb
 - lib/sal/engine.rb
-- lib/sal/filter.rb
 - lib/sal/parser.rb
 - lib/sal/template.rb
 - lib/sal/u.rb
@@ -90,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sal
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: sal is a template language.

data/lib/sal/filter.rb

@@ -1,5 +0,0 @@
-module Sal
-  class Filter < Temple::Filter
-    temple_dispatch :sal
-  end
-end