sal 0.2.2 → 0.2.3

data/README.md

@@ -10,13 +10,13 @@ With all the other options, why sal.rb?
 
 Having spent many years in `<% %>` land with JSP and ERB templates and seeing the issues that arise with this approach, I wanted to eliminate the ability to freely code in views. My first attempt implementing this idea was [RuHL](https://github.com/stonean/ruhl).
 
-RuHL had issues though. First and least important from a proof a concept angle was the name. RuHL rules! Bleh. 
+RuHL had issues though. First and least important from a proof a concept angle was the name. RuHL rules! Bleh.
 
 More to the point: RuHL wasn't compilable and therefore didn't fit easily into the world of Ruby templates. After a short time, the frameworks I had support for (Rails and Sinatra) progressed past RuHL's ability to hack its way into the framework.
 
 Earlier this year I started work on [sal.js](https://github.com/stonean/sal.js) to tackle another view related issue. It just so happens that the idea behind RuHL was the way to make sal.js a reality. While working on sal.js, I refined the approach RuHL took to make it smarter.
 
-As it happens, request were made to bring RuHL up-to-date and make it work with the latest and greatest. Also as it happens, this was turning out to be more work that I wanted to put into RuHL knowing the architecture simply wouldn't work in the long term. 
+As it happens, request were made to bring RuHL up-to-date and make it work with the latest and greatest. Also as it happens, this was turning out to be more work that I wanted to put into RuHL knowing the architecture simply wouldn't work in the long term.
 
 After weeks of distractions and no real clue how to make a compilable RuHL , the solution presented itself and here we are.
 
@@ -27,7 +27,7 @@ sal.rb works by parsing your HTML looking for a data-sal attribute and executing
 The simplest of return values is a string. This tells sal to make this value the contents of the tag.
 
 Lets say there's a method called title:
-    
+
     def title
       'This is different'
     end
@@ -47,7 +47,7 @@ As you've no doubt noticed, the data-sal attribute is gone and the contents have
 The next return value sal knows about is a hash. With the exception of an :html key, sal simply treats each of the keys as attributes to be added to the tag. The value of the html key becomes the value of the tag.
 
 Lets say there's a method called login_link:
-    
+
     def login_link
       if logged_in?
         { :href => '/logout', :html => 'Log out' }
@@ -58,7 +58,7 @@ Lets say there's a method called login_link:
 
 Then you have some markup in your template like so:
 
-    <a data-sal="title">Login link</a>
+    <a data-sal="login_link">Login link</a>
 
 If logged_in is false you'll get:
 
@@ -96,7 +96,7 @@ This will give you the Rails-y format for input tags. For example, if current_us
       def full_name
         first_name + " " + last_name
       end
-    def 
+    end
 
     <!-- first_name = 'John', last_name = 'Smith, email = 'jsmith@test.com' -->
     <div>

data/lib/sal/compiler.rb

@@ -23,17 +23,21 @@ module Sal
     def on_sal_code(code, tag, attrs, content)
       tmp1, tmp2 = unique_name, unique_name
       content = compile(content)
-      [: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}"]]]
+      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}"]]]
+      end
     end
 
     private

data/lib/sal/engine.rb

@@ -12,6 +12,6 @@ module Sal
     filter :StaticMerger      # Merge several statics into a single static
     filter :DynamicInliner    # Merge several static/dynamic into single dynamic
 
-    use(:Generator) { |exp| options[:generator].new(options).call(exp) }
+    wildcard(:Generator) { options[:generator].new(options) }
   end
 end

data/lib/sal/version.rb

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

metadata

@@ -1,61 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sal
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.3
   prerelease: 
-  version: 0.2.2
 platform: ruby
-authors: 
+authors:
 - Andrew Stone
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-15 00:00:00 -04:00
+date: 2011-10-20 00:00:00.000000000 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2161648640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.4"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: temple
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2161648640
+- !ruby/object:Gem::Dependency
+  name: temple
+  requirement: &2161648120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.3"
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: tilt
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2161648120
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: &2161647640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.2"
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *2161647640
 description: sal.rb is an attribute language.
-email: 
+email:
 - andy@stonean.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - README.md
 - lib/sal.rb
 - lib/sal/compiler.rb
@@ -68,30 +65,27 @@ files:
 has_rdoc: true
 homepage: http://github.com/stonean/sal.rb
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: sal
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: sal is a template language.
 test_files: []
-