Remarkably 0.2.1 → 0.3.0

data/lib/remarkably.rb

@@ -1,35 +1,84 @@
 module Remarkably
   def method_missing(sym, *args, &block)
-    hash = if args.size > 0 && args[-1].class == Hash
-             args.pop
-           else
-             Hash.new
-           end
-    tag! sym.to_s.downcase, args, hash, &block
-  end
-  def tag! tag, inline, attributes, &block
-    @remarkably = '' if !@remarkably
+    hash = args.last.is_a?(Hash) ? args.pop : {}
+    tag!(sym.to_s.downcase, args, hash, &block)
+  end
+
+  def tag_xml!( tag, inline, attributes, &block )
     tag_attributes =
-      attributes.inject([]) do |result,data_pair|
-        key,data = data_pair
-        result << "#{key.to_s.downcase}=\"#{data.to_s}\""
-      end.join(' ')
-    @remarkably << "<#{tag}" +
-      (tag_attributes.size > 0 ? ' ' + tag_attributes : '')
-    if block_given? or inline.size > 0
+      attributes.inject([]){|s,(k,v)| s << %{#{k.to_s.downcase}="#{v}"} }
+
+    @remarkably << ["<#{tag}", tag_attributes].flatten.grep(/\S/).join(' ')
+
+    if block_given? or not inline.empty?
       @remarkably << ">"
-      result = block.call if block_given?
-      @remarkably << inline.shift.to_s while inline.size > 0
-      @remarkably << "</#{tag}>"
+      @remarkably_method = :css if @remarkably_method == :xml and tag == "style"
+      block.call if block_given?
+      if @remarkably_method == :css and tag == "style"
+        @remarkably_method = :xml
+        @remarkably << "\n"
+      end
+      @remarkably << "#{inline.join}</#{tag}>"
     else
       @remarkably << "/>"
     end
+  end
+
+  def tag_css!( tag, inline, attributes, &block )
+    @remarkably_method = :css_inner
+    if block_given?
+      @remarkably << "\n "
+      tag_css_inner!( tag, inline, attributes, &block )
+      @remarkably << "}"
+    end
+    @remarkably_method = :css
+  end
+
+  def inline_style &block
+    current_remarkably = @remarkably
+    @remarkably_method = :css_inner
+    @remarkably = ''
+    block.call if block_given?
+    result = @remarkably
+    @remarkably_method = :xml
+    @remarkably = current_remarkably
+    result
+  end
+
+  def tag_css_inner!( tag, inline, attributes, &block )
+    if block_given?
+      @remarkably.chop!
+      @remarkably << "#{tag}#{inline.join}"
+      @remarkably << ".#{attributes[:class]}" if attributes.has_key?( :class )
+      @remarkably << "##{attributes[:id]}" if attributes.has_key?( :id )
+      @remarkably << ":#{attributes[:pseudo]}" if attributes.has_key?( :pseudo )
+      @remarkably << " {"
+      block.call
+    else
+      tag.gsub!('_','-')
+      @remarkably << "#{tag}:#{inline.join(' ')};"
+    end
+  end
+
+  def tag!(tag, inline, attributes, &block)
+    @remarkably ||= ''
+    @remarkably_method ||= :xml
+
+    case @remarkably_method
+    when :xml       then tag_xml!( tag, inline, attributes, &block )
+    when :css       then tag_css!( tag, inline, attributes, &block )
+    when :css_inner then tag_css_inner!( tag, inline, attributes, &block )
+    else raise "Unknown remarkably method type '#{@remarkably_method}'"
+    end
+
     self
   end
+
   def text content
     @remarkably << content
     self
   end
+
   def remarkably
     result = @remarkably
     @remarkably = nil

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: Remarkably
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2007-05-03 00:00:00 +02:00
+  version: 0.3.0
+date: 2007-05-15 00:00:00 +02:00
 summary: Remarkably is a very tiny Markaby-like XML builder
 require_paths: 
 - lib