RubyGems - tagz - Versions diffs - 5.0.0 → 5.0.1 - Mend

tagz 5.0.0 → 5.0.1

Files changed (6) hide show

data/README CHANGED

@@ -14,13 +14,34 @@ DESCRIPTION
   tagz.rb is generates html, xml, or any sgml variant like a small ninja
   running across the backs of a herd of giraffes swatting of heads like a
-  mark-up weedwacker.  weighing in at less than 200 lines of code tagz.rb adds
-  an html syntax to ruby that is both unobtrusive, safe, and available
+  mark-up weedwacker.  weighing in at less than 300 lines of code tagz.rb adds
+  an html/xml/sgml syntax to ruby that is both unobtrusive, safe, and available
   globally to objects without the need for any builder or superfluous objects.
   tagz.rb is designed for applications that generate html to be able to do so
   easily in any context without heavyweight syntax or scoping issues, like a
   ninja sword through butter.
+FEATURES
+  - use as a library or mixin
+  - simple, clean and consistent mark-up that is easy to visually
+    distinguish from other ruby methods
+  - auto-compatibility with rails/actionview
+  - ability to independently open and close tagz in markup
+  - intelligent auto-escaping of both attributes and content for both html
+    and xml
+  - validate your html/xml with 'ruby -c' syntax check
+  - generally bitchin
+  - no lame method_missing approach that prevents tagz like 'type' from being
+    generated
 RAILS
   in config/environment.rb
@@ -73,6 +94,14 @@ INSTALL
   gem install tagz
 HISTORY
+  5.0.0
+    - introduce better escaping for attributes using xchar.rb approach
+    - indroduce smart escaping for content
+    - make Tagz.globally kick ass more hard
+    - note that this version is not backward compatibile if you were relying
+      on tagz never escaping any content should be an ok upgrade for most
+      applications
   4.6.0
     - fix a bug with self closing tagz that had crept in 1.0.0 -> 4.2.0.  thx
       jeremy hinegardner
@@ -128,7 +157,8 @@ SAMPLES
     # the need for '<% rows.each do |row| %> ... <% row.each do |cell| %> '
     # madness and other types of logic to be coded in the templating language,
     # leaving templating to template engines and logic and looping to ruby -
-    # unencumbered by extra funky syntax
+    # unencumbered by extra funky syntax.  in rails tagz will automatically be
+    # available in your erb templates.
     #
     require 'tagz'
@@ -142,21 +172,15 @@ SAMPLES
       <html>
         <body>
           <%=
-            if rows
-              table_{
-                rows.each do |row|
-                  tr_{
-                    row.each do |cell|
-                      td_{ cell }
-                    end
-                  }
-                end
-              }
-            end
+            table_{
+              rows.each do |row|
+                tr_{
+                  row.each do |cell|
+                    td_{ cell }
+                  end
+                }
+              end
+            }
           %>
         </body>
       </html>
@@ -217,13 +241,13 @@ SAMPLES
         html_
           body_(:class => 'ninja-like', :id => 'giraffe-slayer')
-          tagz << "\n<!-- this is the header -->\n"
+          ___ "<!-- this is the header -->"
       }
     end
     def footer
       tagz{
-        tagz << "\n<!-- this is the footer -->\n"
+        ___ "<!-- this is the footer -->"
         body_
           html_
@@ -282,20 +306,58 @@ SAMPLES
     # but can sometimes make reading the generated html a bit rough.  of course
     # using tidy or the dom inspector in firebug obviates the issue; nevertheless
     # it's sometime nice to break things up a little.  you can use 'tagz << "\n"'
-    # or the special shorthand '__' to accomplish this
+    # or the special shorthand '__' or '___' to accomplish this
     #
     require 'tagz'
     include Tagz.globally
-    p div_{
-      span_{ true }
-      __
-      span_{ false }  # hey ryan, i fixed this ;-)
-      __
-    }
+    html =
+      div_{
+        span_{ true }
+        __
+        span_{ false }  # hey ryan, i fixed this ;-)
+        ___
+        ___ 'foo & escaped bar'
+      }
+    puts html
   ~ > ruby samples/f.rb
-    "<div><span>true</span>\n<span>false</span>\n</div>"
+    <div><span>true</span>
+    <span>false</span>
+    foo & escaped bar
+    </div>
+  <========< samples/g.rb >========>
+  ~ > cat samples/g.rb
+    # tagz gives you low-level control of the output and makes even dashersized
+    # xml tagz easy enough to work with
+    #
+    require 'tagz'
+    include Tagz.globally
+    xml =
+      root_{
+        tagz__('foo-bar', :key => 'foo&bar'){ 'content' }
+        tagz__('bar-foo')
+        tagz.concat 'content'
+        tagz.concat tagz.escape('foo&bar')
+        __tagz('bar-foo')
+      }
+    puts xml
+  ~ > ruby samples/g.rb
+    <root><foo-bar key="foo&amp;bar">content</foo-bar><bar-foo>contentfoo&amp;bar</bar-foo></root>

data/a.rb CHANGED

@@ -1,10 +1,12 @@
 require 'tagz'
-include Tagz.privately
+include Tagz.globally
-def bar
-  missing
-end
+c = Class.new{
+  include Tagz.globally
+  def a() tagz{ a_{ b(tagz); nil } } end
+  def b(doc) tagz(doc){ b_{ 'content' } } end
+}.new
+puts c.a
-puts div_{ 'foobar' }
-bar

data/gemspec.rb CHANGED

@@ -1,7 +1,5 @@
 #! /usr/bin/env gem build
-lib, version = File::basename(File::dirname(File::expand_path(__FILE__))).split %r/-/, 2
 require 'rubygems'
 Gem::Specification::new do |spec|
@@ -14,10 +12,10 @@ Gem::Specification::new do |spec|
     end
   end
-  spec.name = lib
-  spec.version = version
+  spec.name = $lib
+  spec.version = $version
   spec.platform = Gem::Platform::RUBY
-  spec.summary = lib
+  spec.summary = $lib
   spec.files = shiteless[Dir::glob("**/**")]
   spec.executables = shiteless[Dir::glob("bin/*")].map{|exe| File::basename exe}
@@ -25,7 +23,7 @@ Gem::Specification::new do |spec|
   spec.require_path = "lib"
   spec.has_rdoc = true #File::exist? "doc"
-  spec.test_suite_file = "test/#{ lib }.rb" if File::file?("test/#{ lib }.rb")
+  spec.test_suite_file = "test/#{ $lib }.rb" if File::file?("test/#{ $lib }.rb")
   #spec.add_dependency 'lib', '>= version'
   #spec.add_dependency 'fattr'
@@ -34,5 +32,13 @@ Gem::Specification::new do |spec|
   spec.rubyforge_project = 'codeforpeople'
   spec.author = "Ara T. Howard"
   spec.email = "ara.t.howard@gmail.com"
-  spec.homepage = "http://codeforpeople.com/lib/ruby/#{ lib }/"
+  spec.homepage = "http://codeforpeople.com/lib/ruby/#{ $lib }/"
 end
+BEGIN{
+  Dir.chdir(File.dirname(__FILE__))
+  $lib = 'tagz'
+  Kernel.load "./lib/#{ $lib }.rb"
+  $version = Tagz.version
+}

data/lib/tagz.rb CHANGED

@@ -5,7 +5,7 @@ unless defined? Tagz
       Tagz::VERSION = [
         Tagz::VERSION_MAJOR = 5,
         Tagz::VERSION_MINOR = 0,
-        Tagz::VERSION_TEENY = 0
+        Tagz::VERSION_TEENY = 1
       ].join('.')
       def Tagz.version() Tagz::VERSION end
     end
@@ -42,12 +42,18 @@ unless defined? Tagz
         if block
           size = tagz.size
           value = block.call(tagz)
-          if NilClass === value
-            tagz[-1] = "/>"
+          if value.nil?
+            unless(tagz.size > size)
+              tagz[-1] = "/>"
+            else
+              tagz.concat "</#{ name }>"
+            end
           else
             tagz << value.to_s unless(tagz.size > size)
             tagz.concat "</#{ name }>"
           end
         end
       else
         tagz << content.join

data/test/tagz.rb CHANGED

@@ -536,4 +536,18 @@ class TagzTest < Test::Unit::TestCase
     assert_raises(NoMethodError){ c.barfoo }
   end
+  def test_450
+    c = Class.new{
+      include Tagz.globally
+      def a() tagz{ a_{ b(tagz); nil } } end
+      def b(doc=nil) tagz(doc){ b_{ 'content' } } end
+    }.new
+    actual=nil
+    assert_nothing_raised{ actual=c.a }
+    expected = '<a><b>content</b></a>'
+    assert_equal expected, actual
+    assert_nothing_raised{ c.b }
+  end
 end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tagz
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Ara T. Howard
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-03-23 00:00:00 -06:00
+date: 2009-03-25 00:00:00 -06:00
 default_executable:
 dependencies: []