tagz 0.0.2 → 0.0.4

data/lib/tagz.rb

@@ -1,20 +1,19 @@
 module Tagz
-  Tagz::VERSION = '0.0.1' unless defined? Tagz::VERSION
+  Tagz::VERSION = '0.0.4' unless defined? Tagz::VERSION
   def self.version() VERSION end
 
   class NotOpen < StandardError; end
   class StillOpen < StandardError; end
 
   class << self
-#--{{{
     def default_non_container_tag_list
+      # http://www.w3schools.com/xhtml/xhtml_ref_byfunc.asp
       %w[
         br hr input img area base basefont
       ]
     end
 
     def non_container_tag_list *argv 
-#--{{{
       if argv.first
         @non_container_tag_list = [argv.first].flatten.uniq.map{|arg| arg.to_s}
         @non_container_tags = @non_container_tag_list.inject(Hash.new){|h,k| h.update k => true}
@@ -27,35 +26,34 @@ module Tagz
           @non_container_tag_list
         end
       end
-#--}}}
     end
+
     def non_container_tags
-#--{{{
       if defined?(@non_container_tags) and @non_container_tags
         @non_container_tags
       else
         non_container_tag_list
         @non_container_tags
       end
-#--}}}
     end
+
     def container? tag
       not(non_container_tags[tag.to_s] or false)
     end
+
     def emtpy? tag
       not container?(tag)
     end
-#--}}}
   end
 
-  module Fragment  #--{{{
+  module Fragment
     attr_accessor 'tag' 
     attr_accessor 'open' 
     attr_accessor 'added' 
     attr_accessor 'created_at'
     alias_method 'open?', 'open'
 
-    def self.new str='', tag='', options = {} #--{{{
+    def self.new str='', tag='', options = {}
       return str if Fragment === str
       str.extend Fragment
       str.tag = tag.to_s
@@ -65,13 +63,7 @@ module Tagz
       options.each{|k,v| str.send "#{ k }=", v}
       str.created_at = caller
       str
-    end #--}}}
-
-=begin
-    def tag
-      stack.last
     end
-=end
 
     def stack 
       @stack ||= []
@@ -87,31 +79,86 @@ module Tagz
       stack.pop
     end
 
-    def closes? other #--{{{
+    def closes? other
       tag.to_s == other.tag.to_s
-    end #--}}}
+    end
 
-    def << content #--{{{
+    def << content
       super content.to_s
-    end            #--}}}
+    end
 
-    def add fragment  #--{{{
+    def add fragment
       push fragment
       oid = fragment.object_id
       self << fragment unless added[oid]
       self
     ensure
       added[oid] = true
-    end  #--}}}
-  end  #--}}}
+    end
+  end
+
 
+  module Abilities
+  private
+    def tagz *argv, &block
+      stack = __tag_stack__
+      top = stack.last
+      size = stack.size
 
-  module Abilities  #--{{{
-    def __tag_stack__  #--{{{
+      unless block
+        top ||= Fragment()
+        if argv.empty?
+          top
+        else
+          string = argv.join
+          top.add string 
+          string
+        end
+      else
+        obj = Tagz === self ? self : clone.instance_eval{ extend Tagz; self }
+        stack << (top=Fragment())
+        top = stack.last
+        tid = top.object_id
+
+        string = obj.instance_eval(&block)
+
+        until stack.last.object_id == tid
+          pop = stack.pop
+          last = stack.last
+          last.add pop 
+        end
+
+        top = stack.pop
+
+        content_was_added = top.size > 0
+        top.add string unless content_was_added
+
+        top
+      end
+    end
+
+    def method_missing m, *a, &b
+      case m.to_s
+        when %r/^(.*[^_])_(!)?$/o
+          m, bang = $1, $2
+          unless bang
+            __tag_start__ m, *a, &b
+          else
+            __tag_start__(m, *a){}
+          end
+        when %r/^_([^_].*)$/o
+          m = $1 
+          __tag_stop__ m, *a, &b
+        else
+          super
+      end
+    end
+
+    def __tag_stack__
       @__tag_stack__ ||= []
-    end  #--}}}
+    end
 
-    def __tag_attrs__ attrs = {}  #--{{{
+    def __tag_attrs__ attrs = {}
       return nil if attrs.empty?
       ( 42 - 10 ).chr <<
         case attrs
@@ -120,9 +167,9 @@ module Tagz
           else
             attrs.to_s
         end
-    end  #--}}}
+    end
 
-    def __tag_start__ *argv, &block  #--{{{
+    def __tag_start__ *argv, &block
       tag = argv.shift
 
       case argv.size
@@ -235,9 +282,9 @@ module Tagz
 
         content
       end
-    end  #--}}}
+    end
 
-    def __tag_stop__ tag  #--{{{
+    def __tag_stop__ tag
       stack = __tag_stack__
       top = stack.last
       stop = Fragment( "</#{ tag }>", tag, :open => false )
@@ -255,68 +302,10 @@ module Tagz
       else
         raise NotOpen, tag.to_s
       end
-    end  #--}}}
-
-    def method_missing m, *a, &b  #--{{{
-      case m.to_s
-        when %r/^(.*[^_])_(!)?$/o
-          m, bang = $1, $2
-          unless bang
-            __tag_start__ m, *a, &b
-          else
-            __tag_start__(m, *a){}
-          end
-        when %r/^_([^_].*)$/o
-          m = $1 
-          __tag_stop__ m, *a, &b
-        else
-          super
-      end
-    end  #--}}}
-
-    def tagz *argv, &block  #--{{{
-      stack = __tag_stack__
-      top = stack.last
-      size = stack.size
-
-      unless block
-        top ||= Fragment()
-        if argv.empty?
-          top
-        else
-          string = argv.join
-          top.add string 
-          string
-        end
-      else
-        obj = Tagz === self ? self : clone.instance_eval{ extend Tagz; self }
-        stack << (top=Fragment())
-        top = stack.last
-        tid = top.object_id
-
-        string = obj.instance_eval(&block)
-
-        until stack.last.object_id == tid
-          pop = stack.pop
-          last = stack.last
-          last.add pop 
-        end
-
-        top = stack.pop
-
-        content_was_added = top.size > 0
-        top.add string unless content_was_added
-
-        top
-      end
-    end  #--}}}
-    alias_method "markup", "tagz"
-    alias_method "__", "tagz"
-    alias_method "_", "tagz"
+    end
 
     def Fragment(*a, &b) Fragment.new(*a, &b) end
 
-### TODO - i'd like to use 'tag' for these but action view has eaten it!
     def element tag, *a, &b
       __tag_stack__ << (top=Fragment())
       __tag_start__ tag, *a, &b
@@ -354,36 +343,15 @@ module Tagz
                    'xml:lang' => 'en'
       decl << html_(attrs, &b)
     end
-  end  #--}}}
-
-
-### OLD CRAP
-=begin
-    def concat s  #--{{{
-      tagz << s.to_s
-      self
-    end  #--}}}
-    def tag *a, &b  #--{{{
-      __tag_start__ *a, &b
-    end  #--}}}
-    def tag! *a, &b  #--{{{
-      __tag_start__(*a){}
-    end  #--}}}
-    def tag_ *a, &b  #--{{{
-      __tag_start__ *a, &b
-    end  #--}}}
-    def _tag *a, &b  #--{{{
-      __tag_stop__ *a, &b
-    end  #--}}}
-=end
+  end
 
-  def self.included other  #--{{{
+  def self.included other
     other.module_eval{ include Abilities }
-  end  #--}}}
+  end
 
-  def self.extend_object other  #--{{{
+  def self.extend_object other
     other.extend Abilities 
-  end  #--}}}
+  end
 
   class ::String
     include Tagz 
@@ -416,7 +384,23 @@ module Tagz
       tagz{ __tag_start__(self, *a){} }
     end
   end
+end
 
+class Object
+  def Tagz &block
+    const = Object.const_get :Tagz
+    if block
+      if const === self
+        this = self
+      else
+        this = eval('self', block).dup
+        this.send :extend, Tagz
+      end
+      this.send :tagz, &block
+    else
+      const
+    end
+  end
 end
 
 require File.join(File.dirname(__FILE__), 'tagz', 'rails') if defined? Rails

data/test/tagz.rb

@@ -301,7 +301,7 @@ class TagzTest < Test::Unit::TestCase
       html_{
         body_{
           div_ :k => :v 
-          _ "content"
+          tagz << "content"
           _div
         }
       }
@@ -331,16 +331,15 @@ class TagzTest < Test::Unit::TestCase
   def test_280  #--{{{
     expected = 'content'
     actual = (
-      __ "content"
+      tagz << "content"
     )
     assert_equal expected, actual
   end  #--}}}
   def test_290  #--{{{
     expected = 'foobar'
     actual = (
-      _{
-        __ 'foo'
-        __ 'bar'
+      tagz {
+        tagz << 'foo' << 'bar'
       }
     )
     assert_equal expected, actual
@@ -348,7 +347,7 @@ class TagzTest < Test::Unit::TestCase
   def test_300  #--{{{
     expected = 'foobar'
     actual = (
-      _{ __ 'foo', 'bar' }
+      tagz{ tagz 'foo', 'bar' }
     )
     assert_equal expected, actual
   end  #--}}}

metadata

@@ -1,35 +1,27 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: tagz
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2007-07-18 00:00:00 -06:00
-summary: tagz
-require_paths: 
-- lib
-email: ara.t.howard@noaa.gov
-homepage: http://codeforpeople.com/lib/ruby/tagz/
-rubyforge_project: 
-description: 
-autorequire: tagz
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.0.4
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Ara T. Howard
+autorequire: tagz
+bindir: bin
+cert_chain: []
+
+date: 2008-02-14 00:00:00 -07:00
+default_executable: 
+dependencies: []
+
+description: 
+email: ara.t.howard@noaa.gov
+executables: []
+
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
-- a.rb
 - gemspec.rb
 - gen_readme.rb
 - install.rb
@@ -144,18 +136,31 @@ files:
 - sample/a.rb
 - test
 - test/tagz.rb
-- tidy
-test_files: 
-- test/tagz.rb
+has_rdoc: false
+homepage: http://codeforpeople.com/lib/ruby/tagz/
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: []
-
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: 
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: tagz
+test_files: 
+- test/tagz.rb

data/a.rb

@@ -1,12 +0,0 @@
-require './lib/tagz'
-include Tagz
-
-puts tagz {
-  a_ 'a'
-  b_ 'b'
-  c_ 'c'
-  foo_{}
-  div_{}
-}
-
-

data/tidy

@@ -1,3 +0,0 @@
-require 'rubygems'
-require 'hpricot'
-puts Hpricot(ARGF)