sal 0.3.1 → 0.3.2

data/lib/sal.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 require 'temple'
-require 'sal/u'
+require 'sal/view'
 require 'sal/wrapper'
 require 'sal/parser'
 require 'sal/compiler'

data/lib/sal/compiler.rb

@@ -14,7 +14,7 @@ module Sal
 
     def on_sal_text(text, code = nil)
       if code
-        [:dynamic, "Sal::U.parse_for_html(_saldict, '#{code}', '#{text}')"]
+        [:dynamic, "Sal::View.parse_for_html(_saldict, '#{code}', '#{text}')"]
       else
         [:static, text]
       end
@@ -39,7 +39,7 @@ module Sal
     end
 
     def ada(attrs)
-      [:dynamic,  "Sal::U.parse_for_attributes(_saldict, #{attrs.inspect})"]
+      [:dynamic,  "Sal::View.parse_for_attributes(_saldict, #{attrs.inspect})"]
     end
   end
 end

data/lib/sal/version.rb

@@ -1,3 +1,3 @@
 module Sal
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/lib/sal/{u.rb → view.rb}

@@ -1,21 +1,25 @@
 # encoding: utf-8
 
 module Sal
-  class U 
+  class View
     class << self
       def parse_for_attributes(result = nil, attrs = {})
         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']
-          result['class'] = attrs['class'] + ' ' + result['class']
+        if result.kind_of?(Hash) 
+          result = stringify_keys(result)
+          if result['html']
+            result.delete('html')
+            # concat values on class attribute
+            if attrs['class'] && result['class']
+              attrs['class'] << " #{result['class']}"
+              result.delete('class')
+            end
+            attrs.merge!(result)
+          end
         end
 
-        " #{result.collect{ |k,v| "#{k}='#{v}'" unless k.to_s == 'html' }.compact.join(' ')}"
+        attrs.empty? ?  '' : " #{attrs.collect{ |k,v| "#{k}='#{v}'"}.compact.join(' ')}"
       end
 
       def parse_for_html(result, code, text = '')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sal
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2153584420 !ruby/object:Gem::Requirement
+  requirement: &2153427000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2153584420
+  version_requirements: *2153427000
 - !ruby/object:Gem::Dependency
   name: temple
-  requirement: &2153583900 !ruby/object:Gem::Requirement
+  requirement: &2153426480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2153583900
+  version_requirements: *2153426480
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &2153583420 !ruby/object:Gem::Requirement
+  requirement: &2153426000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2153583420
+  version_requirements: *2153426000
 description: sal.rb is an attribute language.
 email:
 - andy@stonean.com
@@ -59,8 +59,8 @@ files:
 - lib/sal/engine.rb
 - lib/sal/parser.rb
 - lib/sal/template.rb
-- lib/sal/u.rb
 - lib/sal/version.rb
+- lib/sal/view.rb
 - lib/sal/wrapper.rb
 has_rdoc: true
 homepage: http://github.com/stonean/sal.rb