sculpt 0.1 → 0.1.01

data/lib/sculpt/elements.rb

@@ -3,33 +3,26 @@ class Tag < ElementContainer
     
     attr_accessor :name, :text, :attrs, :singelton, :inline
     
-    def initialize(name,text = '', attrs = {},&block)
+    def initialize(name, text = '', attrs = {}, &block)
         @name = name
         @attrs = {}
         @elements = []
         @inline = false
+        @text = ''
         
-        if text.kind_of?(Hash)
-            if attrs.kind_of? Tag
-                @inline = attrs
-                @elements << attrs
-                return self
-            else
-                @attrs = attrs
-                @attrs.merge!(text)
-                @text = '' # otherwise stays nil
-            end
-        elsif text.kind_of?(Tag)
+        if text.kind_of? Tag
             @inline = text
             @elements << text
-            @text = ''
-            @attrs = attrs
+            @attrs.merge!(attrs) if attrs.kind_of? Hash
             return self
-        else
+        elsif text.kind_of? Hash
+            @attrs.merge!(text)
+        elsif text.kind_of? String
             @text = text
-            @attrs = attrs
         end
         
+        @attrs.merge!(attrs) if attrs.kind_of? Hash
+        
         if block_given?
             @elements += elements_from_block(&block)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sculpt
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.01
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ bindir: bin
 cert_chain: []
 date: 2012-06-10 00:00:00.000000000 Z
 dependencies: []
-description: ! "Sculpt is an HTML generator in Ruby.\n    Syntax is everything"
+description: ! "Sculpt is an HTML generator in Ruby.\n    Syntax is everything."
 email: lexy0202@gmail.com
 executables: []
 extensions: []