sal 0.2.0 → 0.2.1

data/README.md

@@ -44,7 +44,7 @@ As you've no doubt noticed, the data-sal attribute is gone and the contents have
 
 
 #### Hash
-The next return value sal knows about is a hash. With the exception of an :html key, sal simply treats each the keys as attributes to be added to the tag. The value of the html key becomes the value of the tag.
+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:
     
@@ -64,6 +64,48 @@ If logged_in is false you'll get:
 
     <a href='/login'>Log in</a>
 
+#### Object
+For Rails users, you will probably need to access objects like an ActiveRecord model in your view. To simplify this, you can have tags scoped to an object.
+
+For example, you may have a user detail page:
+
+    <div data-sal="current_user">
+      <h1>Welcome <span data-sal="full_name">Awesome user</span></h1>
+      <form method="post" action="/account">
+        <input data-sal="email_input" type="text"/>
+      ...
+      </form>
+    </div>
+
+Since this will probably be a common scenario you probably don't want to write an input method for each attribute, so lets use method_missing:
+
+    def method_missing(meth)
+      meth = meth.to_s
+      if meth =~ /_input$/
+        name  = meth.split('_').first
+        klass = self.class.name.downcase
+        {:name => "#{klass}[#{name}]", :id => "#{klass}_#{name}", :value => send(name)}
+      else
+        super
+      end
+    end
+
+This will give you the Rails-y format for input tags. For example, if current_user returns a user object where:
+
+    class User < ActiveRecord::Base
+      def full_name
+        first_name + " " + last_name
+      end
+    def 
+
+    <!-- first_name = 'John', last_name = 'Smith, email = 'jsmith@test.com' -->
+    <div>
+      <h1>Welcome <span>John Smith</span></h1>
+      <form method="post" action="/account">
+        <input name="user[email]" id="user_email" value="jsmith@test.com" type="text"/>
+      ...
+      </form>
+    </div>
 
 #### Array
 If the return value is an array, sal repeats the markup for each item in the array applying the contents accordingly.

data/lib/sal/compiler.rb

@@ -15,26 +15,22 @@ module Sal
       end
     end
 
-    def on_sal_nested(tag, attrs, content)
-      [:html, :tag, tag, ada(attrs, '_saldict'), false, compile(content)]
-    end
-
     def on_sal_code(code, tag, attrs, content)
       tmp1, tmp2 = tmp_var(:sal), tmp_var(:sal)
-
+      content = compile(content)
       [:multi,
         [:block,  "if (#{tmp1} = _saldict['#{code}'])"],
+        [:block,    "#{tmp2}  = _saldict"],
+        [:block,    "_saldict = #{tmp1}"],
         [:block,    "case (#{tmp1})"],
         [:block,    "when Array"],
-        [:block,      "#{tmp2} = _saldict"],
         [:block,      "#{tmp1}.each do |_saldict|"],
-                        compile([:sal, :nested, tag, attrs, content]),
+                        [:html, :tag, tag, ada(attrs), false, content],
         [:block,      'end'],
-        [:block,      "_saldict = #{tmp2}"],
         [:block,    "else"],
-                      [:html, :tag, tag, ada(attrs, tmp1), false,
-                        [:dynamic, "Sal::U.parse_for_html(#{tmp1})"]],
+                      [:html, :tag, tag, ada(attrs), false, content],
         [:block,    'end'],
+        [:block,    "_saldict = #{tmp2}"],
         [:block,  'end'],
       ]
     end
@@ -47,8 +43,8 @@ module Sal
       [:multi, [:html, :staticattrs] + a]
     end
 
-    def ada(attrs, tmpvar)
-      [:dynamic,  "Sal::U.parse_for_attributes(#{tmpvar}, #{attrs.inspect})"]
+    def ada(attrs)
+      [:dynamic,  "Sal::U.parse_for_attributes(_saldict, #{attrs.inspect})"]
     end
   end
 end

data/lib/sal/parser.rb

@@ -7,22 +7,6 @@ module Sal
     set_default_options :tabsize => 4,
                         :encoding => 'utf-8'
 
-    class << self
-      #TODO: Remove node_types after fleshing out tests
-      def node_types
-        @node_types ||= define_node_types
-      end
-
-      private
-      def define_node_types
-        nt = {}
-        Nokogiri::XML::Node.constants.each do |name|
-          nt[eval("Nokogiri::XML::Node::#{name}")] = name if name =~ /_NODE$/
-        end
-        nt
-      end
-    end # class block
-
     def initialize(options = {})
       super
       @tab = ' ' * @options[:tabsize]
@@ -82,8 +66,6 @@ module Sal
           stacks.last << [:static, node.to_s]
         when Nokogiri::XML::Node::COMMENT_NODE
           stacks.last << [:html, :comment, [:static, node.text]]
-        else
-          raise "Unexpected node type: #{self.class.node_types[node.node_type]}"
         end
       end
     end

data/lib/sal/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: sal
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Andrew Stone
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 -04:00
+date: 2011-04-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency